mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-14 18:14:53 +02:00
Code Issues Releases Wiki Activity

Version 1.4.6: Small fixes and additions

Browse Source
This commit is contained in:
trendschau
2021-05-18 21:28:55 +02:00
parent 812e4b1c26
commit 84bf68f690
49 changed files with 390 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/Models/Field.php
View File

@@ -71,7 +71,8 @@ class Field
'min',
'max',
'class',
'pattern'
'pattern',
'steps'
);
/* defines additional data, that are allowed for fields */

24
system/Models/User.php
View File

@@ -21,6 +21,9 @@ class User extends WriteYaml
$usernames[] = str_replace('.yaml', '', $userfile);
}
usort($usernames, 'strnatcasecmp');
return $usernames;
}
@@ -235,8 +238,13 @@ class User extends WriteYaml
{
if(file_exists($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-mail.txt'))
{
# read and return the file
$usermailindex = file($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-mail.txt');
# unserialize and return the file
$usermailindex = unserialize(file_get_contents($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-mail.txt'));
if($usermailindex)
{
return $usermailindex;
}
}
$usernames = $this->getUsers();
@@ -249,7 +257,7 @@ class User extends WriteYaml
$usermailindex[$userdata['email']] = $username;
}
file_put_contents($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-mail.txt', var_export($usermailindex, TRUE));
file_put_contents($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-mail.txt', serialize($usermailindex));
return $usermailindex;
}
@@ -304,8 +312,12 @@ class User extends WriteYaml
{
if(file_exists($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-role.txt'))
{
# read and return the file
$userroleindex = file($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-role.txt');
# unserialize and return the file
$userroleindex = unserialize(file_get_contents($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-role.txt'));
if($userroleindex)
{
return $userroleindex;
}
}
$usernames = $this->getUsers();
@@ -318,7 +330,7 @@ class User extends WriteYaml
$userroleindex[$userdata['userrole']][] = $username;
}
file_put_contents($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-role.txt', var_export($userroleindex, TRUE));
file_put_contents($this->userDir . DIRECTORY_SEPARATOR . 'tmuserindex-role.txt', serialize($userroleindex));
return $userroleindex;
}