Skip to content

Commit 61c1b98

Browse files
Dmi3yyDmi3yy
committed
Evolution CMS 3.1.0
1 parent 56c2a52 commit 61c1b98

File tree

8 files changed

+105
-86
lines changed

8 files changed

+105
-86
lines changed

‎core/vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
require_once __DIR__ . '/composer/autoload_real.php';
66

7-
return ComposerAutoloaderInit823070f5cc91f221d3fa32425e3cae58::getLoader();
7+
return ComposerAutoloaderInit6dbb3d30635d64b67fa86b81d651d4e3::getLoader();

‎core/vendor/composer/InstalledVersions.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class InstalledVersions
1919
'aliases' =>
2020
array (
2121
),
22-
'reference' => 'bd62f946959066db9663c077d37e001e5825f9d2',
22+
'reference' => '56c2a52cec3fdc8818fbc09c42509a9cf34144e9',
2323
'name' => 'evolutioncms/core',
2424
),
2525
'versions' =>
@@ -143,12 +143,12 @@ class InstalledVersions
143143
),
144144
'evolutioncms-services/user-manager' =>
145145
array (
146-
'pretty_version' => '1.0.2',
147-
'version' => '1.0.2.0',
146+
'pretty_version' => '1.0.4',
147+
'version' => '1.0.4.0',
148148
'aliases' =>
149149
array (
150150
),
151-
'reference' => '131651c595a6475cb849bc6df3b418c8e920d54b',
151+
'reference' => '2c3085f5306f989d014fce6c83dccb9f728061fe',
152152
),
153153
'evolutioncms/core' =>
154154
array (
@@ -157,7 +157,7 @@ class InstalledVersions
157157
'aliases' =>
158158
array (
159159
),
160-
'reference' => 'bd62f946959066db9663c077d37e001e5825f9d2',
160+
'reference' => '56c2a52cec3fdc8818fbc09c42509a9cf34144e9',
161161
),
162162
'graham-campbell/result-type' =>
163163
array (

‎core/vendor/composer/autoload_real.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit823070f5cc91f221d3fa32425e3cae58
5+
class ComposerAutoloaderInit6dbb3d30635d64b67fa86b81d651d4e3
66
{
77
private static $loader;
88

@@ -24,15 +24,15 @@ public static function getLoader()
2424

2525
require __DIR__ . '/platform_check.php';
2626

27-
spl_autoload_register(array('ComposerAutoloaderInit823070f5cc91f221d3fa32425e3cae58', 'loadClassLoader'), true, true);
27+
spl_autoload_register(array('ComposerAutoloaderInit6dbb3d30635d64b67fa86b81d651d4e3', 'loadClassLoader'), true, true);
2828
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
29-
spl_autoload_unregister(array('ComposerAutoloaderInit823070f5cc91f221d3fa32425e3cae58', 'loadClassLoader'));
29+
spl_autoload_unregister(array('ComposerAutoloaderInit6dbb3d30635d64b67fa86b81d651d4e3', 'loadClassLoader'));
3030

3131
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
3232
if ($useStaticLoader) {
3333
require __DIR__ . '/autoload_static.php';
3434

35-
call_user_func(\Composer\Autoload\ComposerStaticInit823070f5cc91f221d3fa32425e3cae58::getInitializer($loader));
35+
call_user_func(\Composer\Autoload\ComposerStaticInit6dbb3d30635d64b67fa86b81d651d4e3::getInitializer($loader));
3636
} else {
3737
$map = require __DIR__ . '/autoload_namespaces.php';
3838
foreach ($map as $namespace => $path) {
@@ -53,19 +53,19 @@ public static function getLoader()
5353
$loader->register(true);
5454

5555
if ($useStaticLoader) {
56-
$includeFiles = Composer\Autoload\ComposerStaticInit823070f5cc91f221d3fa32425e3cae58::$files;
56+
$includeFiles = Composer\Autoload\ComposerStaticInit6dbb3d30635d64b67fa86b81d651d4e3::$files;
5757
} else {
5858
$includeFiles = require __DIR__ . '/autoload_files.php';
5959
}
6060
foreach ($includeFiles as $fileIdentifier => $file) {
61-
composerRequire823070f5cc91f221d3fa32425e3cae58($fileIdentifier, $file);
61+
composerRequire6dbb3d30635d64b67fa86b81d651d4e3($fileIdentifier, $file);
6262
}
6363

6464
return $loader;
6565
}
6666
}
6767

68-
function composerRequire823070f5cc91f221d3fa32425e3cae58($fileIdentifier, $file)
68+
function composerRequire6dbb3d30635d64b67fa86b81d651d4e3($fileIdentifier, $file)
6969
{
7070
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
7171
require $file;

‎core/vendor/composer/autoload_static.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit823070f5cc91f221d3fa32425e3cae58
7+
class ComposerStaticInit6dbb3d30635d64b67fa86b81d651d4e3
88
{
99
public static $files = array (
1010
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -3722,9 +3722,9 @@ class ComposerStaticInit823070f5cc91f221d3fa32425e3cae58
37223722
public static function getInitializer(ClassLoader $loader)
37233723
{
37243724
return \Closure::bind(function () use ($loader) {
3725-
$loader->prefixLengthsPsr4 = ComposerStaticInit823070f5cc91f221d3fa32425e3cae58::$prefixLengthsPsr4;
3726-
$loader->prefixDirsPsr4 = ComposerStaticInit823070f5cc91f221d3fa32425e3cae58::$prefixDirsPsr4;
3727-
$loader->classMap = ComposerStaticInit823070f5cc91f221d3fa32425e3cae58::$classMap;
3725+
$loader->prefixLengthsPsr4 = ComposerStaticInit6dbb3d30635d64b67fa86b81d651d4e3::$prefixLengthsPsr4;
3726+
$loader->prefixDirsPsr4 = ComposerStaticInit6dbb3d30635d64b67fa86b81d651d4e3::$prefixDirsPsr4;
3727+
$loader->classMap = ComposerStaticInit6dbb3d30635d64b67fa86b81d651d4e3::$classMap;
37283728

37293729
}, null, ClassLoader::class);
37303730
}

‎core/vendor/composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,20 +1057,20 @@
10571057
},
10581058
{
10591059
"name": "evolutioncms-services/user-manager",
1060-
"version": "1.0.2",
1061-
"version_normalized": "1.0.2.0",
1060+
"version": "1.0.4",
1061+
"version_normalized": "1.0.4.0",
10621062
"source": {
10631063
"type": "git",
10641064
"url": "https://github.com/evolution-cms/UserManager.git",
1065-
"reference": "131651c595a6475cb849bc6df3b418c8e920d54b"
1065+
"reference": "2c3085f5306f989d014fce6c83dccb9f728061fe"
10661066
},
10671067
"dist": {
10681068
"type": "zip",
1069-
"url": "https://api.github.com/repos/evolution-cms/UserManager/zipball/131651c595a6475cb849bc6df3b418c8e920d54b",
1070-
"reference": "131651c595a6475cb849bc6df3b418c8e920d54b",
1069+
"url": "https://api.github.com/repos/evolution-cms/UserManager/zipball/2c3085f5306f989d014fce6c83dccb9f728061fe",
1070+
"reference": "2c3085f5306f989d014fce6c83dccb9f728061fe",
10711071
"shasum": ""
10721072
},
1073-
"time": "2021-02-16T17:53:37+00:00",
1073+
"time": "2021-02-17T12:36:04+00:00",
10741074
"type": "library",
10751075
"installation-source": "dist",
10761076
"autoload": {
@@ -1090,7 +1090,7 @@
10901090
],
10911091
"support": {
10921092
"issues": "https://github.com/evolution-cms/UserManager/issues",
1093-
"source": "https://github.com/evolution-cms/UserManager/tree/1.0.2"
1093+
"source": "https://github.com/evolution-cms/UserManager/tree/1.0.4"
10941094
},
10951095
"install-path": "../evolutioncms-services/user-manager"
10961096
},

‎core/vendor/composer/installed.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'aliases' =>
77
array (
88
),
9-
'reference' => 'bd62f946959066db9663c077d37e001e5825f9d2',
9+
'reference' => '56c2a52cec3fdc8818fbc09c42509a9cf34144e9',
1010
'name' => 'evolutioncms/core',
1111
),
1212
'versions' =>
@@ -130,12 +130,12 @@
130130
),
131131
'evolutioncms-services/user-manager' =>
132132
array (
133-
'pretty_version' => '1.0.2',
134-
'version' => '1.0.2.0',
133+
'pretty_version' => '1.0.4',
134+
'version' => '1.0.4.0',
135135
'aliases' =>
136136
array (
137137
),
138-
'reference' => '131651c595a6475cb849bc6df3b418c8e920d54b',
138+
'reference' => '2c3085f5306f989d014fce6c83dccb9f728061fe',
139139
),
140140
'evolutioncms/core' =>
141141
array (
@@ -144,7 +144,7 @@
144144
'aliases' =>
145145
array (
146146
),
147-
'reference' => 'bd62f946959066db9663c077d37e001e5825f9d2',
147+
'reference' => '56c2a52cec3fdc8818fbc09c42509a9cf34144e9',
148148
),
149149
'graham-campbell/result-type' =>
150150
array (

‎core/vendor/evolutioncms-services/user-manager/src/Services/Users/UserLogin.php‎

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ public function process(): \Illuminate\Database\Eloquent\Model
131131
$this->authProcess();
132132
$this->checkRemember();
133133
$this->clearActiveUsers();
134-
$this->writeLog();
135134

136135
if ($this->events) {
137136
// invoke OnManagerLogin event
@@ -179,28 +178,36 @@ public function validateAuth(): bool
179178

180179
// this user has been blocked by an admin, so no way he's loggin in!
181180
if ($this->user->attributes->blocked == '1') {
182-
@session_destroy();
183-
session_unset();
181+
if(!defined('NO_SESSION')) {
182+
@session_destroy();
183+
session_unset();
184+
}
184185
throw new ServiceActionException(\Lang::get('global.login_processor_blocked1'));
185186
}
186187

187188
if ($this->user->attributes->verified != 1) {
188-
@session_destroy();
189-
session_unset();
189+
if(!defined('NO_SESSION')) {
190+
@session_destroy();
191+
session_unset();
192+
}
190193
throw new ServiceActionException(\Lang::get('global.login_processor_verified'));
191194
}
192195

193196
// blockuntil: this user has a block until date
194197
if ($this->user->attributes->blockeduntil > time()) {
195-
@session_destroy();
196-
session_unset();
198+
if(!defined('NO_SESSION')) {
199+
@session_destroy();
200+
session_unset();
201+
}
197202
throw new ServiceActionException(\Lang::get('global.login_processor_blocked2'));
198203
}
199204

200205
// blockafter: this user has a block after date
201206
if ($this->user->attributes->blockedafter > 0 && $this->user->attributes->blockedafter < time()) {
202-
@session_destroy();
203-
session_unset();
207+
if(!defined('NO_SESSION')) {
208+
@session_destroy();
209+
session_unset();
210+
}
204211
throw new ServiceActionException(\Lang::get('global.login_processor_blocked2'));
205212
}
206213

@@ -233,7 +240,29 @@ public function authProcess()
233240

234241
EvolutionCMS()->cleanupExpiredLocks();
235242
EvolutionCMS()->cleanupMultipleActiveUsers();
243+
if(!defined('NO_SESSION')) {
244+
$this->writeSession();
245+
}
246+
// successful login so reset fail count and update key values
247+
$this->user->attributes->failedlogincount = 0;
248+
$this->user->attributes->logincount += 1;
249+
$this->user->attributes->thislogin = time();
250+
$this->user->attributes->lastlogin = time();
251+
$this->user->attributes->save();
252+
253+
$this->user->refresh_token = hash('sha256', Str::random(32));
254+
$this->user->access_token = hash('sha256', Str::random(32));
255+
$this->user->valid_to = Carbon::now()->addHours(11);
256+
$this->user->save();
257+
258+
// get user's document groups
259+
$i = 0;
260+
236261

262+
}
263+
264+
public function writeSession()
265+
{
237266
$currentsessionid = session_regenerate_id();
238267

239268
$_SESSION['usertype'] = 'manager'; // user is a backend user
@@ -258,21 +287,7 @@ public function authProcess()
258287
}
259288
$_SESSION['mgrPermissions'] = $permissionsRole;
260289
}
261-
// successful login so reset fail count and update key values
262-
$this->user->attributes->failedlogincount = 0;
263-
$this->user->attributes->logincount += 1;
264-
$this->user->attributes->thislogin = time();
265-
$this->user->attributes->lastlogin = time();
266290
$this->user->attributes->sessionid = $currentsessionid;
267-
$this->user->attributes->save();
268-
269-
$this->user->refresh_token = hash('sha256', Str::random(32));
270-
$this->user->access_token = hash('sha256', Str::random(32));
271-
$this->user->valid_to = Carbon::now()->addHours(11);
272-
$this->user->save();
273-
274-
// get user's document groups
275-
$i = 0;
276291

277292
$_SESSION['mgrDocgroups'] = \EvolutionCMS\Models\MemberGroup::query()
278293
->join('membergroup_access', 'membergroup_access.membergroup', '=', 'member_groups.user_group')
@@ -322,11 +337,6 @@ public function clearActiveUsers()
322337
}
323338
}
324339

325-
public function writeLog()
326-
{
327-
$log = new \EvolutionCMS\Legacy\LogHandler();
328-
$log->initAndWriteLog('Logged in', EvolutionCMS()->getLoginUserID('mgr'), $_SESSION['mgrShortname'], '58', '-', 'EVO');
329-
}
330340

331341
public function incrementFailedLoginCount(): void
332342
{

0 commit comments

Comments
 (0)