@@ -412,7 +412,7 @@ |
||
412 | 412 | private static function makeSeed() |
413 | 413 | { |
414 | 414 | list($usec, $sec) = explode(' ', microtime()); |
415 | - return $sec + $usec * 1000000; |
|
415 | + return $sec + $usec*1000000; |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | /** |
@@ -867,10 +867,10 @@ |
||
867 | 867 | |
868 | 868 | if ($loginExist && ($email == $user->getUserData('email'))) { |
869 | 869 | $consonants = array( |
870 | - 'b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','y','z', |
|
870 | + 'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z', |
|
871 | 871 | ); |
872 | 872 | $vowels = array( |
873 | - 'a','e','i','o','u', |
|
873 | + 'a', 'e', 'i', 'o', 'u', |
|
874 | 874 | ); |
875 | 875 | $newPassword = ''; |
876 | 876 | for ($i = 1; $i <= 4; ++$i) { |
@@ -58,7 +58,7 @@ |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | $leftVarsOnly = array_slice($_SESSION['trans']['leftVarsOnly'], |
61 | - ($page - 1) * $itemsPerPage, |
|
61 | + ($page - 1)*$itemsPerPage, |
|
62 | 62 | $itemsPerPage); |
63 | 63 | $rightVarsOnly = &$_SESSION['trans']['rightVarsOnly']; |
64 | 64 |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | foreach ($userList as $single_user) { |
67 | 67 | $user->getUserById($single_user, true); |
68 | 68 | $users[] = array('user_id' => $user->getUserId(), |
69 | - 'login' => $user->getLogin(), ); |
|
69 | + 'login' => $user->getLogin(),); |
|
70 | 70 | } |
71 | 71 | echo json_encode($users); |
72 | 72 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | foreach ($memberList as $single_member) { |
79 | 79 | $user->getUserById($single_member, true); |
80 | 80 | $members[] = array('user_id' => $user->getUserId(), |
81 | - 'login' => $user->getLogin(), ); |
|
81 | + 'login' => $user->getLogin(),); |
|
82 | 82 | } |
83 | 83 | echo json_encode($members); |
84 | 84 | } |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | |
39 | 39 | case 'upload': |
40 | 40 | |
41 | - $uploadDir = PMF_ROOT_DIR . '/images/'; |
|
41 | + $uploadDir = PMF_ROOT_DIR.'/images/'; |
|
42 | 42 | $uploadFile = basename($_FILES['upload']['name']); |
43 | 43 | $isUploaded = false; |
44 | 44 | $height = $width = 0; |
45 | - $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ]; |
|
45 | + $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png']; |
|
46 | 46 | |
47 | 47 | if ($csrfOkay) { |
48 | 48 | if (is_uploaded_file($uploadedFile['tmp_name']) && |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | if ($fileInfo && $isUploaded) { |
72 | 72 | list($width, $height) = $fileInfo; |
73 | - if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
73 | + if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) { |
|
74 | 74 | $isUploaded = true; |
75 | 75 | } else { |
76 | 76 | $isUploaded = false; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * Build language variable definitions |
46 | 46 | * @todo Change input handling using PMF_Filter |
47 | 47 | */ |
48 | - foreach ((array) @$_POST['PMF_LANG'] as $key => $val) { |
|
48 | + foreach ((array)@$_POST['PMF_LANG'] as $key => $val) { |
|
49 | 49 | if (is_string($val)) { |
50 | 50 | $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val); |
51 | 51 | $val = str_replace("'", "\\'", $val); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - foreach ((array) @$_POST['LANG_CONF'] as $key => $val) { |
|
65 | + foreach ((array)@$_POST['LANG_CONF'] as $key => $val) { |
|
66 | 66 | // if string like array(blah-blah-blah), extract the contents inside the brackets |
67 | 67 | if (preg_match('/^\s*array\s*\(\s*(\d+.+)\s*\).*$/', $val, $matches1)) { |
68 | 68 | // split the resulting string of delimiters such as "number =>" |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $langDir = PMF_Filter::filterInput(INPUT_POST, 'langdir', FILTER_SANITIZE_STRING); |
193 | 193 | $langNPlurals = strval(PMF_Filter::filterVar(@$_POST['langnplurals'], FILTER_VALIDATE_INT, -1)); |
194 | 194 | $langDesc = PMF_Filter::filterInput(INPUT_POST, 'langdesc', FILTER_SANITIZE_STRING); |
195 | - $author = (array) @$_POST['author']; |
|
195 | + $author = (array)@$_POST['author']; |
|
196 | 196 | |
197 | 197 | if (empty($langCode) || empty($langName) || empty($langCharset) || |
198 | 198 | empty($langDir) || empty($langDesc) || empty($author)) { |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $dateEnd = PMF_Filter::filterInput(INPUT_POST, 'dateEnd', FILTER_SANITIZE_STRING); |
42 | 42 | $question = PMF_Filter::filterInput(INPUT_POST, 'question', FILTER_SANITIZE_STRING); |
43 | 43 | $categories = PMF_Filter::filterInputArray(INPUT_POST, array('rubrik' => array('filter' => FILTER_VALIDATE_INT, |
44 | - 'flags' => FILTER_REQUIRE_ARRAY, ))); |
|
44 | + 'flags' => FILTER_REQUIRE_ARRAY,))); |
|
45 | 45 | $record_lang = PMF_Filter::filterInput(INPUT_POST, 'lang', FILTER_SANITIZE_STRING); |
46 | 46 | $tags = PMF_Filter::filterInput(INPUT_POST, 'tags', FILTER_SANITIZE_STRING); |
47 | 47 | $active = PMF_Filter::filterInput(INPUT_POST, 'active', FILTER_SANITIZE_STRING); |
@@ -105,7 +105,7 @@ |
||
105 | 105 | 'UID' => $user, |
106 | 106 | 'PWD' => $passwd, |
107 | 107 | 'Database' => $database, |
108 | - 'CharacterSet' => 'UTF-8', ); |
|
108 | + 'CharacterSet' => 'UTF-8',); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
@@ -1058,8 +1058,8 @@ |
||
1058 | 1058 | // To make passwords harder to get wrong, a few letters & numbers have been omitted. |
1059 | 1059 | // This will ensure safety with browsers using fonts with confusable letters. |
1060 | 1060 | // Removed: o,O,0,1,l,L |
1061 | - $consonants = ['b','c','d','f','g','h','j','k','m','n','p','r','s','t','v','w','x','y','z']; |
|
1062 | - $vowels = ['a','e','i','u']; |
|
1061 | + $consonants = ['b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z']; |
|
1062 | + $vowels = ['a', 'e', 'i', 'u']; |
|
1063 | 1063 | $newPassword = ''; |
1064 | 1064 | $skipped = false; |
1065 | 1065 |