@@ -653,8 +653,7 @@ |
||
653 | 653 | } |
654 | 654 | if (!$auth->changePassword($login, $pass)) { |
655 | 655 | continue; |
656 | - } |
|
657 | - else { |
|
656 | + } else { |
|
658 | 657 | $success = true; |
659 | 658 | } |
660 | 659 | } |
@@ -160,7 +160,7 @@ |
||
160 | 160 | $source . '/' . $file, |
161 | 161 | $dest . '/' . $directoryName . '/' . $file |
162 | 162 | ); |
163 | - } else { |
|
163 | + } else { |
|
164 | 164 | $this->recursiveCopy($source . '/' . $file, $dest . '/' . $directoryName); |
165 | 165 | } |
166 | 166 | } |
@@ -364,7 +364,9 @@ |
||
364 | 364 | if (count($matches[1])) { |
365 | 365 | $languages = array_combine($matches[1], $matches[4]); |
366 | 366 | foreach ($languages as $lang => $val) { |
367 | - if ($val === '') $languages[$lang] = 1; |
|
367 | + if ($val === '') { |
|
368 | + $languages[$lang] = 1; |
|
369 | + } |
|
368 | 370 | } |
369 | 371 | arsort($languages, SORT_NUMERIC); |
370 | 372 | } |
@@ -329,8 +329,7 @@ |
||
329 | 329 | if ($nextline < 1) { |
330 | 330 | $nextline = 2; |
331 | 331 | } |
332 | - } |
|
333 | - else { |
|
332 | + } else { |
|
334 | 333 | $nextline += rand(1, 7); |
335 | 334 | } |
336 | 335 | $w1 += rand(-4, 4); |
@@ -187,8 +187,9 @@ |
||
187 | 187 | // check user rights, set them TRUE |
188 | 188 | $allUserRights = $user->perm->getAllUserRights($user->getUserId()); |
189 | 189 | foreach ($allRights as $right) { |
190 | - if (in_array($right['right_id'], $allUserRights)) |
|
191 | - $this->permission[$right['name']] = true; |
|
190 | + if (in_array($right['right_id'], $allUserRights)) { |
|
191 | + $this->permission[$right['name']] = true; |
|
192 | + } |
|
192 | 193 | } |
193 | 194 | } |
194 | 195 |
@@ -595,8 +595,9 @@ discard block |
||
595 | 595 | if ($result) { |
596 | 596 | while ($row = $this->_config->getDb()->fetchObject($result)) { |
597 | 597 | $tags[$row->tagging_id] = $row->freq; |
598 | - if (--$limit === 0) |
|
599 | - break; |
|
598 | + if (--$limit === 0) { |
|
599 | + break; |
|
600 | + } |
|
600 | 601 | } |
601 | 602 | } |
602 | 603 | return $tags; |
@@ -632,10 +633,12 @@ discard block |
||
632 | 633 | */ |
633 | 634 | public function is_english($chr) |
634 | 635 | { |
635 | - if (($chr >= 'A') && ($chr <= 'Z')) |
|
636 | - return true; |
|
637 | - if (($chr >= 'a') && ($chr <= 'z')) |
|
638 | - return true; |
|
636 | + if (($chr >= 'A') && ($chr <= 'Z')) { |
|
637 | + return true; |
|
638 | + } |
|
639 | + if (($chr >= 'a') && ($chr <= 'z')) { |
|
640 | + return true; |
|
641 | + } |
|
639 | 642 | return false; |
640 | 643 | } |
641 | 644 | } |
@@ -589,10 +589,13 @@ discard block |
||
589 | 589 | <input type="radio" name="active" value="no"<?php if (isset($sul)) { echo $sul; } ?> /> |
590 | 590 | <?php echo $PMF_LANG['ad_gen_no']; ?> |
591 | 591 | </label> |
592 | - <?php else: ?> |
|
592 | + <?php else { |
|
593 | + : ?> |
|
593 | 594 | <label class="radio"> |
594 | 595 | <input type="radio" name="active" value="no" checked /> |
595 | - <?php echo $PMF_LANG['ad_gen_no']; ?> |
|
596 | + <?php echo $PMF_LANG['ad_gen_no']; |
|
597 | +} |
|
598 | +?> |
|
596 | 599 | </label> |
597 | 600 | <?php endif; ?> |
598 | 601 | </div> |
@@ -647,9 +650,12 @@ discard block |
||
647 | 650 | </div> |
648 | 651 | </div> |
649 | 652 | </div> |
650 | - <?php else: ?> |
|
653 | + <?php else { |
|
654 | + : ?> |
|
651 | 655 | <input type="hidden" name="grouppermission" value="all" /> |
652 | - <?php endif; ?> |
|
656 | + <?php endif; |
|
657 | +} |
|
658 | +?> |
|
653 | 659 | <div class="panel-heading"> |
654 | 660 | <?php echo $PMF_LANG['ad_entry_userpermission']; ?> |
655 | 661 | </div> |
@@ -157,7 +157,7 @@ |
||
157 | 157 | } |
158 | 158 | if ($user instanceof PMF_User_CurrentUser) { |
159 | 159 | $auth = true; |
160 | - } else { |
|
160 | + } else { |
|
161 | 161 | $user = new PMF_User_CurrentUser($faqConfig); |
162 | 162 | } |
163 | 163 | } |
@@ -117,8 +117,9 @@ discard block |
||
117 | 117 | */ |
118 | 118 | |
119 | 119 | // We deal with the second plural form when dealing with the first, so skip it here |
120 | - if ($tt->isKeyASecondPluralForm($key)) |
|
121 | - continue; |
|
120 | + if ($tt->isKeyASecondPluralForm($key)) { |
|
121 | + continue; |
|
122 | + } |
|
122 | 123 | |
123 | 124 | if ($tt->isKeyAFirstPluralForm($key)) { |
124 | 125 | if ($rightNPlurals == -1) { |
@@ -139,10 +140,11 @@ discard block |
||
139 | 140 | echo "<td>".$key."</td>\n"; |
140 | 141 | echo '<td><input class="form-control" type="text" value="'.PMF_String::htmlspecialchars($line).'" disabled="disabled" /></td>'."\n"; |
141 | 142 | if (array_key_exists($key, $rightVarsOnly) && ($line != $rightVarsOnly[$key] || |
142 | - $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line))) |
|
143 | - echo '<td><input class="form-control" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n"; |
|
144 | - else |
|
145 | - echo '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($line).'" /></td>'."\n"; |
|
143 | + $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line))) { |
|
144 | + echo '<td><input class="form-control" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n"; |
|
145 | + } else { |
|
146 | + echo '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($line).'" /></td>'."\n"; |
|
147 | + } |
|
146 | 148 | echo "</tr>\n"; |
147 | 149 | |
148 | 150 | // Add second English form and translation |
@@ -154,10 +156,11 @@ discard block |
||
154 | 156 | // Other language has only one form |
155 | 157 | echo '<td><input class="form-control" type="text" value="'.$PMF_LANG['msgTransToolLanguageOnePlural'].'" disabled="disabled" /></td>'."\n"; |
156 | 158 | } else { |
157 | - if (array_key_exists($key2, $rightVarsOnly)) |
|
158 | - echo '<td><input class="form-control" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key2]).'" /></td>'."\n"; |
|
159 | - else |
|
160 | - echo '<td><input class="form-control alert-danger" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n"; |
|
159 | + if (array_key_exists($key2, $rightVarsOnly)) { |
|
160 | + echo '<td><input class="form-control" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key2]).'" /></td>'."\n"; |
|
161 | + } else { |
|
162 | + echo '<td><input class="form-control alert-danger" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n"; |
|
163 | + } |
|
161 | 164 | } |
162 | 165 | echo "</tr>\n"; |
163 | 166 | |
@@ -167,10 +170,11 @@ discard block |
||
167 | 170 | echo "<tr>\n"; |
168 | 171 | echo "<td>".$keyI."</td>\n"; |
169 | 172 | echo '<td><input class="form-control" type="text" value="" disabled="disabled" /></td>'."\n"; |
170 | - if (array_key_exists($keyI, $rightVarsOnly) && $leftVarsOnly[$key2] != $rightVarsOnly[$key]) |
|
171 | - echo '<td><input class="form-control" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$keyI]).'" /></td>'."\n"; |
|
172 | - else |
|
173 | - echo '<td><input class="form-control alert-danger" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n"; |
|
173 | + if (array_key_exists($keyI, $rightVarsOnly) && $leftVarsOnly[$key2] != $rightVarsOnly[$key]) { |
|
174 | + echo '<td><input class="form-control" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$keyI]).'" /></td>'."\n"; |
|
175 | + } else { |
|
176 | + echo '<td><input class="form-control alert-danger" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n"; |
|
177 | + } |
|
174 | 178 | echo "</tr>\n"; |
175 | 179 | } |
176 | 180 | // We do not need to process this $key any further |
@@ -185,9 +189,12 @@ discard block |
||
185 | 189 | $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line))): |
186 | 190 | ?> |
187 | 191 | <td><input class="form-control" type="text" name="<?php echo $key?>" value="<?php echo PMF_String::htmlspecialchars($rightVarsOnly[$key]) ?>" /></td> |
188 | - <?php else: ?> |
|
192 | + <?php else { |
|
193 | + : ?> |
|
189 | 194 | <td><input class="form-control alert-danger" type="text" name="<?php echo $key?>" value="<?php echo PMF_String::htmlspecialchars($line) ?>" /></td> |
190 | - <?php endif; ?> |
|
195 | + <?php endif; |
|
196 | +} |
|
197 | +?> |
|
191 | 198 | </tr> |
192 | 199 | <?php endwhile; ?> |
193 | 200 | <tr> |