@@ -395,12 +395,12 @@ |
||
| 395 | 395 | public function update(Array $newConfigs) |
| 396 | 396 | { |
| 397 | 397 | $runtimeConfigs = [ |
| 398 | - 'core.database', // PMF_DB_Driver |
|
| 399 | - 'core.instance', // PMF_Instance |
|
| 400 | - 'core.language', // Language |
|
| 401 | - 'core.ldap', // PMF_Ldap |
|
| 402 | - 'core.ldapConfig', // $PMF_LDAP |
|
| 403 | - 'core.elasticsearch', // Elasticsearch\Client |
|
| 398 | + 'core.database', // PMF_DB_Driver |
|
| 399 | + 'core.instance', // PMF_Instance |
|
| 400 | + 'core.language', // Language |
|
| 401 | + 'core.ldap', // PMF_Ldap |
|
| 402 | + 'core.ldapConfig', // $PMF_LDAP |
|
| 403 | + 'core.elasticsearch', // Elasticsearch\Client |
|
| 404 | 404 | 'core.elasticsearchConfig' // $PMF_ES |
| 405 | 405 | ]; |
| 406 | 406 | |
@@ -490,8 +490,8 @@ |
||
| 490 | 490 | $this->headers['X-Mailer'] = $this->_mailer; |
| 491 | 491 | |
| 492 | 492 | // X-MSMail-Priority |
| 493 | - if (isset($this->priorities[(int) $this->priority])) { |
|
| 494 | - $this->headers['X-MSMail-Priority'] = $this->priorities[(int) $this->priority]; |
|
| 493 | + if (isset($this->priorities[(int)$this->priority])) { |
|
| 494 | + $this->headers['X-MSMail-Priority'] = $this->priorities[(int)$this->priority]; |
|
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | // X-Originating-IP |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | echo PMF_Language::languageOptions( |
| 109 | 109 | str_replace( |
| 110 | 110 | array( |
| 111 | - 'language_', |
|
| 112 | - '.php', |
|
| 111 | + 'language_', |
|
| 112 | + '.php', |
|
| 113 | 113 | ), |
| 114 | 114 | '', |
| 115 | 115 | $faqConfig->get('main.language') |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } else { |
| 121 | 121 | echo '<option value="language_en.php">English</option>'; |
| 122 | 122 | } |
| 123 | - break; |
|
| 123 | + break; |
|
| 124 | 124 | |
| 125 | 125 | case 'records.orderby': |
| 126 | 126 | echo PMF_Configuration::sortingOptions($faqConfig->get($key)); |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | </tr> |
| 135 | 135 | <tr> |
| 136 | 136 | <td><?php echo $PMF_LANG['ad_stat_vpd'] ?>:</td> |
| 137 | - <td><?php echo ($danz != 0) ? round(($vanz / $danz), 2) : 0 ?></td> |
|
| 137 | + <td><?php echo ($danz != 0) ? round(($vanz/$danz), 2) : 0 ?></td> |
|
| 138 | 138 | </tr> |
| 139 | 139 | <tr> |
| 140 | 140 | <td><?php echo $PMF_LANG['ad_stat_fien'] ?>:</td> |
@@ -623,12 +623,15 @@ discard block |
||
| 623 | 623 | <input type="radio" name="active" value="no" |
| 624 | 624 | <?php if (isset($sul)) { echo $sul; } ?>> |
| 625 | 625 | <?php echo $PMF_LANG['ad_gen_no'] ?> |
| 626 | - <?php else: ?> |
|
| 626 | + <?php else { |
|
| 627 | + : ?> |
|
| 627 | 628 | <br> |
| 628 | 629 | <input type="radio" name="active" value="no" checked> |
| 629 | 630 | <?php echo $PMF_LANG['ad_gen_no'] ?> |
| 630 | 631 | |
| 631 | - <?php endif; ?> |
|
| 632 | + <?php endif; |
|
| 633 | +} |
|
| 634 | +?> |
|
| 632 | 635 | </label> |
| 633 | 636 | </div> |
| 634 | 637 | </div> |
@@ -689,9 +692,12 @@ discard block |
||
| 689 | 692 | </div> |
| 690 | 693 | </div> |
| 691 | 694 | </div> |
| 692 | - <?php else: ?> |
|
| 695 | + <?php else { |
|
| 696 | + : ?> |
|
| 693 | 697 | <input type="hidden" name="grouppermission" value="all"> |
| 694 | - <?php endif; ?> |
|
| 698 | + <?php endif; |
|
| 699 | +} |
|
| 700 | +?> |
|
| 695 | 701 | <div class="panel-heading"> |
| 696 | 702 | <?php echo $PMF_LANG['ad_entry_userpermission']; ?> |
| 697 | 703 | </div> |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | $queryString = 'saveentry&id='.$faqData['id']; |
| 122 | 122 | } else { |
| 123 | 123 | $queryString = 'insertentry'; |
| 124 | - if (isset($categoryId)){ |
|
| 124 | + if (isset($categoryId)) { |
|
| 125 | 125 | $categories = ['category_id' => $categoryId, 'category_lang' => $lang]; |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | <div id="collapseViewChangelog" class="panel-collapse collapse"> |
| 547 | 547 | <div class="panel-body"> |
| 548 | 548 | <?php |
| 549 | - $currentUserId = $user->getUserId(); |
|
| 549 | + $currentUserId = $user->getUserId(); |
|
| 550 | 550 | foreach ($faq->getChangeEntries($faqData['id']) as $entry) { |
| 551 | 551 | $user->getUserById($entry['user']); |
| 552 | 552 | ?> |
@@ -565,9 +565,9 @@ discard block |
||
| 565 | 565 | <?php echo $entry['changelog'] ?> |
| 566 | 566 | </p> |
| 567 | 567 | <?php |
| 568 | - } |
|
| 569 | - $user->getUserById($currentUserId); |
|
| 570 | - ?> |
|
| 568 | + } |
|
| 569 | + $user->getUserById($currentUserId); |
|
| 570 | + ?> |
|
| 571 | 571 | </div> |
| 572 | 572 | </div> |
| 573 | 573 | </div> |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | <i aria-hidden="true" class="fa fa-plus fa-fw"></i> <?php echo $PMF_LANG['ad_kateg_add']; ?> |
| 37 | 37 | </a> |
| 38 | 38 | <a class="btn btn-info" href="?action=showcategory"> |
| 39 | - <i aria-hidden="true" class="fa fa-th fa-fw"></i> <?php echo $PMF_LANG['ad_categ_show'];?> |
|
| 39 | + <i aria-hidden="true" class="fa fa-th fa-fw"></i> <?php echo $PMF_LANG['ad_categ_show']; ?> |
|
| 40 | 40 | </a> |
| 41 | 41 | </div> |
| 42 | 42 | </h2> |
@@ -322,26 +322,26 @@ discard block |
||
| 322 | 322 | // add faq to category (always) |
| 323 | 323 | printf(' |
| 324 | 324 | <a class="btn btn-info btn-sm" href="?action=editentry&cat=%s&lang=%s"><span title="%s" class="fa fa-file-text-o fa-fw"></span></a> ', |
| 325 | - $cat['id'], |
|
| 326 | - $cat['lang'], |
|
| 327 | - $PMF_LANG['ad_quick_entry'] |
|
| 325 | + $cat['id'], |
|
| 326 | + $cat['lang'], |
|
| 327 | + $PMF_LANG['ad_quick_entry'] |
|
| 328 | 328 | ); |
| 329 | 329 | |
| 330 | 330 | if ($cat['lang'] == $lang) { |
| 331 | 331 | // add sub category (if current language) |
| 332 | - printf(' |
|
| 332 | + printf(' |
|
| 333 | 333 | <a class="btn btn-info btn-sm" href="?action=addcategory&cat=%s&lang=%s"><span title="%s" class="fa fa-plus fa-fw"></span></a> ', |
| 334 | - $cat['id'], |
|
| 335 | - $cat['lang'], |
|
| 336 | - $PMF_LANG['ad_quick_category'] |
|
| 337 | - ); |
|
| 334 | + $cat['id'], |
|
| 335 | + $cat['lang'], |
|
| 336 | + $PMF_LANG['ad_quick_category'] |
|
| 337 | + ); |
|
| 338 | 338 | |
| 339 | - // rename (sub) category (if current language) |
|
| 340 | - printf(' |
|
| 339 | + // rename (sub) category (if current language) |
|
| 340 | + printf(' |
|
| 341 | 341 | <a class="btn btn-info btn-sm" href="?action=editcategory&cat=%s"><span title="%s" class="fa fa-edit fa-fw"></a> ', |
| 342 | - $cat['id'], |
|
| 343 | - $PMF_LANG['ad_kateg_rename'] |
|
| 344 | - ); |
|
| 342 | + $cat['id'], |
|
| 343 | + $PMF_LANG['ad_kateg_rename'] |
|
| 344 | + ); |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | // translate category (always) |
@@ -365,20 +365,20 @@ discard block |
||
| 365 | 365 | |
| 366 | 366 | if ($cat['lang'] == $lang) { |
| 367 | 367 | // cut category (if current language) |
| 368 | - printf( |
|
| 369 | - '<a class="btn btn-warning btn-sm" href="?action=cutcategory&cat=%s"><span title="%s" class="fa fa-cut fa-fw"></a> ', |
|
| 370 | - $cat['id'], |
|
| 371 | - $PMF_LANG['ad_categ_cut'] |
|
| 372 | - ); |
|
| 368 | + printf( |
|
| 369 | + '<a class="btn btn-warning btn-sm" href="?action=cutcategory&cat=%s"><span title="%s" class="fa fa-cut fa-fw"></a> ', |
|
| 370 | + $cat['id'], |
|
| 371 | + $PMF_LANG['ad_categ_cut'] |
|
| 372 | + ); |
|
| 373 | 373 | |
| 374 | 374 | if ($category->numParent($cat['parent_id']) > 1) { |
| 375 | 375 | // move category (if current language) AND more than 1 category at the same level) |
| 376 | - printf( |
|
| 377 | - '<a class="btn btn-warning btn-sm" href="?action=movecategory&cat=%s&parent_id=%s"><span title="%s" class="fa fa-sort fa-fw"></a> ', |
|
| 378 | - $cat['id'], |
|
| 379 | - $cat['parent_id'], |
|
| 380 | - $PMF_LANG['ad_categ_move'] |
|
| 381 | - ); |
|
| 376 | + printf( |
|
| 377 | + '<a class="btn btn-warning btn-sm" href="?action=movecategory&cat=%s&parent_id=%s"><span title="%s" class="fa fa-sort fa-fw"></a> ', |
|
| 378 | + $cat['id'], |
|
| 379 | + $cat['parent_id'], |
|
| 380 | + $PMF_LANG['ad_categ_move'] |
|
| 381 | + ); |
|
| 382 | 382 | } |
| 383 | 383 | } |
| 384 | 384 | |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | 'writeNumberOfArticles' => $plr->getMsg('plmsgHomeArticlesOnline', $faq->getNumberOfRecords($LANGCODE)), |
| 65 | 65 | 'writeSendAdress' => '?'.$sids.'action=search', |
| 66 | 66 | 'searchBox' => $PMF_LANG['msgSearch'], |
| 67 | - 'categoryId' => ($cat === 0) ? '%' : (int) $cat, |
|
| 67 | + 'categoryId' => ($cat === 0) ? '%' : (int)$cat, |
|
| 68 | 68 | 'msgSearch' => sprintf( |
| 69 | 69 | '<a class="help" href="%sindex.php?action=search">%s</a>', |
| 70 | 70 | $faqSystem->getSystemUri($faqConfig), |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | } |
| 63 | 63 | } else { |
| 64 | 64 | $user = PMF_User_CurrentUser::getFromCookie($faqConfig); |
| 65 | - if (! $user instanceof PMF_User_CurrentUser) { |
|
| 65 | + if (!$user instanceof PMF_User_CurrentUser) { |
|
| 66 | 66 | $user = PMF_User_CurrentUser::getFromSession($faqConfig); |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -169,12 +169,15 @@ |
||
| 169 | 169 | action: 'ajax', |
| 170 | 170 | ajax: 'recordAdd' |
| 171 | 171 | }; |
| 172 | - <?php else: ?> |
|
| 172 | + <?php else { |
|
| 173 | + : ?> |
|
| 173 | 174 | var data = { |
| 174 | 175 | action: 'ajax', |
| 175 | 176 | ajax: 'recordSave' |
| 176 | 177 | }; |
| 177 | - <?php endif; ?> |
|
| 178 | + <?php endif; |
|
| 179 | +} |
|
| 180 | +?> |
|
| 178 | 181 | |
| 179 | 182 | $.each($('#faqEditor').serializeArray(), function(i, field) { |
| 180 | 183 | data[field.name] = field.value; |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | <iframe id="keepPMFSessionAlive" src="session.keepalive.php?lang=<?php echo $LANGCODE ?>" width="0" height="0" |
| 61 | 61 | style="display: none;"></iframe> |
| 62 | 62 | <?php |
| 63 | - if (isset($auth) && (('takequestion' == $action) || ('editentry' == $action) || ('editpreview' == $action) || |
|
| 63 | + if (isset($auth) && (('takequestion' == $action) || ('editentry' == $action) || ('editpreview' == $action) || |
|
| 64 | 64 | ('addnews' == $action) || ('editnews' == $action) || ('copyentry' == $action))) { |
| 65 | 65 | if ($faqConfig->get('main.enableWysiwygEditor') == true) { |
| 66 | 66 | ?> |