@@ -195,8 +195,7 @@ |
||
| 195 | 195 | ); |
| 196 | 196 | |
| 197 | 197 | $categories[$row_board['id_cat']]['link'] = '<a id="c' . $row_board['id_cat'] . '"></a>' . (!$context['user']['is_guest'] ? |
| 198 | - '<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' : |
|
| 199 | - $row_board['cat_name']); |
|
| 198 | + '<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']); |
|
| 200 | 199 | |
| 201 | 200 | } |
| 202 | 201 | |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | |
| 852 | 852 | clean_cache('data'); |
| 853 | 853 | |
| 854 | - cache_put_data('parsed_boards_descriptions_'. $parsed_boards_cat_id, $already_parsed_boards, 864000); |
|
| 854 | + cache_put_data('parsed_boards_descriptions_' . $parsed_boards_cat_id, $already_parsed_boards, 864000); |
|
| 855 | 855 | |
| 856 | 856 | if (empty($boardOptions['dont_log'])) |
| 857 | 857 | logAction('edit_board', array('board' => $board_id), 'admin'); |
@@ -1579,7 +1579,7 @@ discard block |
||
| 1579 | 1579 | $context['description_allowed_tags'] |
| 1580 | 1580 | ); |
| 1581 | 1581 | |
| 1582 | - cache_put_data('parsed_boards_descriptions_'. $category_id, $already_parsed_boards, 864000); |
|
| 1582 | + cache_put_data('parsed_boards_descriptions_' . $category_id, $already_parsed_boards, 864000); |
|
| 1583 | 1583 | |
| 1584 | 1584 | return $already_parsed_boards; |
| 1585 | 1585 | } |
@@ -455,7 +455,7 @@ |
||
| 455 | 455 | |
| 456 | 456 | elseif ($context['uninstalling']) |
| 457 | 457 | echo ' |
| 458 | - ', $txt['package_uninstall_done'] .' <br> |
|
| 458 | + ', $txt['package_uninstall_done'] . ' <br> |
|
| 459 | 459 | ', '<a href="', $context['keep_url'], '" class="button">', $txt['package_keep'], '</a>', '<a href="', $context['remove_url'], '" class="button">', $txt['package_delete2'], '</a>'; |
| 460 | 460 | |
| 461 | 461 | elseif ($context['install_finished']) |
@@ -364,8 +364,8 @@ discard block |
||
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | // Clean up tags with children |
| 367 | - foreach($bbcTagsChildren as $parent_tag => $children) |
|
| 368 | - foreach($children as $index => $child_tag) |
|
| 367 | + foreach ($bbcTagsChildren as $parent_tag => $children) |
|
| 368 | + foreach ($children as $index => $child_tag) |
|
| 369 | 369 | { |
| 370 | 370 | // Remove entries where parent and child tag is the same |
| 371 | 371 | if ($child_tag == $parent_tag) |
@@ -1888,25 +1888,25 @@ discard block |
||
| 1888 | 1888 | $fields = array(); |
| 1889 | 1889 | $new_sort = array(); |
| 1890 | 1890 | |
| 1891 | - while($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1891 | + while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1892 | 1892 | $fields[] = $row['id_field']; |
| 1893 | 1893 | $smcFunc['db_free_result']($request); |
| 1894 | 1894 | |
| 1895 | 1895 | $idx = array_search($context['fid'], $fields); |
| 1896 | 1896 | |
| 1897 | - if ($_GET['move'] == 'down' && count($fields) - 1 > $idx ) |
|
| 1897 | + if ($_GET['move'] == 'down' && count($fields) - 1 > $idx) |
|
| 1898 | 1898 | { |
| 1899 | - $new_sort = array_slice($fields ,0 ,$idx ,true); |
|
| 1899 | + $new_sort = array_slice($fields, 0, $idx, true); |
|
| 1900 | 1900 | $new_sort[] = $fields[$idx + 1]; |
| 1901 | 1901 | $new_sort[] = $fields[$idx]; |
| 1902 | - $new_sort += array_slice($fields ,$idx + 2 ,count($fields) ,true); |
|
| 1902 | + $new_sort += array_slice($fields, $idx + 2, count($fields), true); |
|
| 1903 | 1903 | } |
| 1904 | 1904 | elseif ($context['fid'] > 0 and $idx < count($fields)) |
| 1905 | 1905 | { |
| 1906 | - $new_sort = array_slice($fields ,0 ,($idx - 1) ,true); |
|
| 1906 | + $new_sort = array_slice($fields, 0, ($idx - 1), true); |
|
| 1907 | 1907 | $new_sort[] = $fields[$idx]; |
| 1908 | 1908 | $new_sort[] = $fields[$idx - 1]; |
| 1909 | - $new_sort += array_slice($fields ,($idx + 1) ,count($fields) ,true); |
|
| 1909 | + $new_sort += array_slice($fields, ($idx + 1), count($fields), true); |
|
| 1910 | 1910 | } |
| 1911 | 1911 | else |
| 1912 | 1912 | redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler |
@@ -393,18 +393,18 @@ discard block |
||
| 393 | 393 | $quickbuttons = array( |
| 394 | 394 | 'approve' => array( |
| 395 | 395 | 'label' => $txt['approve'], |
| 396 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';approve='.$item['id'], |
|
| 396 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';approve=' . $item['id'], |
|
| 397 | 397 | 'icon' => 'approve', |
| 398 | 398 | ), |
| 399 | 399 | 'delete' => array( |
| 400 | 400 | 'label' => $txt['remove'], |
| 401 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';delete='.$item['id'], |
|
| 401 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';delete=' . $item['id'], |
|
| 402 | 402 | 'icon' => 'remove_button', |
| 403 | 403 | 'show' => $item['can_delete'] |
| 404 | 404 | ), |
| 405 | 405 | 'quickmod' => array( |
| 406 | 406 | 'class' => 'inline_mod_check', |
| 407 | - 'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>', |
|
| 407 | + 'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>', |
|
| 408 | 408 | 'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 |
| 409 | 409 | ), |
| 410 | 410 | ); |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | $quickbuttons = array( |
| 470 | 470 | 'delete' => array( |
| 471 | 471 | 'label' => $txt['remove_message'], |
| 472 | - 'href' => $scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'], |
|
| 472 | + 'href' => $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
| 473 | 473 | 'javascript' => 'data-confirm="' . $txt['mc_watched_users_delete_post'] . '"', |
| 474 | 474 | 'class' => 'you_sure', |
| 475 | 475 | 'icon' => 'remove_button', |
@@ -1535,14 +1535,14 @@ discard block |
||
| 1535 | 1535 | $output['quickbuttons'] = array( |
| 1536 | 1536 | 'quote' => array( |
| 1537 | 1537 | 'label' => $txt['quote_action'], |
| 1538 | - 'href' => $scripturl.'?action=post;quote='.$output['id'].';topic='.$context['current_topic'], '.'.$context['start'].';last_msg='.$context['topic_last_message'], |
|
| 1539 | - 'javascript' => 'onclick="return oQuickReply.quote('.$output['id'].');"', |
|
| 1538 | + 'href' => $scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . $context['current_topic'], '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], |
|
| 1539 | + 'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"', |
|
| 1540 | 1540 | 'icon' => 'quote', |
| 1541 | 1541 | 'show' => $context['can_quote'] |
| 1542 | 1542 | ), |
| 1543 | 1543 | 'quote_selected' => array( |
| 1544 | 1544 | 'label' => $txt['quote_selected_action'], |
| 1545 | - 'id' => 'quoteSelected_'. $output['id'], |
|
| 1545 | + 'id' => 'quoteSelected_' . $output['id'], |
|
| 1546 | 1546 | 'href' => 'javascript:void(0)', |
| 1547 | 1547 | 'custom' => 'style="display:none"', |
| 1548 | 1548 | 'icon' => 'quote_selected', |
@@ -1551,74 +1551,74 @@ discard block |
||
| 1551 | 1551 | 'quick_edit' => array( |
| 1552 | 1552 | 'label' => $txt['quick_edit'], |
| 1553 | 1553 | 'class' => 'quick_edit', |
| 1554 | - 'id' => 'modify_button_'. $output['id'], |
|
| 1555 | - 'custom' => 'onclick="oQuickModify.modifyMsg(\''.$output['id'].'\', \''.!empty($modSettings['toggle_subject']).'\')"', |
|
| 1554 | + 'id' => 'modify_button_' . $output['id'], |
|
| 1555 | + 'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty($modSettings['toggle_subject']) . '\')"', |
|
| 1556 | 1556 | 'icon' => 'quick_edit_button', |
| 1557 | 1557 | 'show' => $output['can_modify'] |
| 1558 | 1558 | ), |
| 1559 | 1559 | 'more' => array( |
| 1560 | 1560 | 'modify' => array( |
| 1561 | 1561 | 'label' => $txt['modify'], |
| 1562 | - 'href' => $scripturl.'?action=post;msg='.$output['id'].';topic='.$context['current_topic'].'.'.$context['start'], |
|
| 1562 | + 'href' => $scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . $context['current_topic'] . '.' . $context['start'], |
|
| 1563 | 1563 | 'icon' => 'modify_button', |
| 1564 | 1564 | 'show' => $output['can_modify'] |
| 1565 | 1565 | ), |
| 1566 | 1566 | 'remove_topic' => array( |
| 1567 | 1567 | 'label' => $txt['remove_topic'], |
| 1568 | - 'href' => $scripturl.'?action=removetopic2;topic='.$context['current_topic'].'.'.$context['start'].';'.$context['session_var'].'='.$context['session_id'], |
|
| 1569 | - 'javascript' => 'data-confirm="'.$txt['are_sure_remove_topic'].'"', |
|
| 1568 | + 'href' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
| 1569 | + 'javascript' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', |
|
| 1570 | 1570 | 'class' => 'you_sure', |
| 1571 | 1571 | 'icon' => 'remove_button', |
| 1572 | 1572 | 'show' => $context['can_delete'] && ($context['topic_first_message'] == $output['id']) |
| 1573 | 1573 | ), |
| 1574 | 1574 | 'remove' => array( |
| 1575 | 1575 | 'label' => $txt['remove'], |
| 1576 | - 'href' => $scripturl.'?action=deletemsg;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
| 1577 | - 'javascript' => 'data-confirm="'.$txt['remove_message_question'].'"', |
|
| 1576 | + 'href' => $scripturl . '?action=deletemsg;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
| 1577 | + 'javascript' => 'data-confirm="' . $txt['remove_message_question'] . '"', |
|
| 1578 | 1578 | 'class' => 'you_sure', |
| 1579 | 1579 | 'icon' => 'remove_button', |
| 1580 | 1580 | 'show' => $output['can_remove'] && ($context['topic_first_message'] != $output['id']) |
| 1581 | 1581 | ), |
| 1582 | 1582 | 'split' => array( |
| 1583 | 1583 | 'label' => $txt['split'], |
| 1584 | - 'href' => $scripturl.'?action=splittopics;topic='.$context['current_topic'].'.0;at='.$output['id'], |
|
| 1584 | + 'href' => $scripturl . '?action=splittopics;topic=' . $context['current_topic'] . '.0;at=' . $output['id'], |
|
| 1585 | 1585 | 'icon' => 'split_button', |
| 1586 | 1586 | 'show' => $context['can_split'] && !empty($context['real_num_replies']) |
| 1587 | 1587 | ), |
| 1588 | 1588 | 'report' => array( |
| 1589 | 1589 | 'label' => $txt['report_to_mod'], |
| 1590 | - 'href' => $scripturl.'?action=reporttm;topic='.$context['current_topic'].'.'.$output['counter'].';msg='.$output['id'], |
|
| 1590 | + 'href' => $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'], |
|
| 1591 | 1591 | 'icon' => 'error', |
| 1592 | 1592 | 'show' => $context['can_report_moderator'] |
| 1593 | 1593 | ), |
| 1594 | 1594 | 'warn' => array( |
| 1595 | 1595 | 'label' => $txt['issue_warning'], |
| 1596 | - 'href' => $scripturl.'?action=profile;area=issuewarning;u='.$output['member']['id'].';msg='.$output['id'], |
|
| 1596 | + 'href' => $scripturl . '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'], |
|
| 1597 | 1597 | 'icon' => 'warn_button', |
| 1598 | 1598 | 'show' => $context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest'] |
| 1599 | 1599 | ), |
| 1600 | 1600 | 'restore' => array( |
| 1601 | 1601 | 'label' => $txt['restore_message'], |
| 1602 | - 'href' => $scripturl.'?action=restoretopic;msgs='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
| 1602 | + 'href' => $scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
| 1603 | 1603 | 'icon' => 'restore_button', |
| 1604 | 1604 | 'show' => $context['can_restore_msg'] |
| 1605 | 1605 | ), |
| 1606 | 1606 | 'approve' => array( |
| 1607 | 1607 | 'label' => $txt['approve'], |
| 1608 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
| 1608 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
| 1609 | 1609 | 'icon' => 'approve_button', |
| 1610 | 1610 | 'show' => $output['can_approve'] |
| 1611 | 1611 | ), |
| 1612 | 1612 | 'unapprove' => array( |
| 1613 | 1613 | 'label' => $txt['unapprove'], |
| 1614 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
| 1614 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
| 1615 | 1615 | 'icon' => 'unapprove_button', |
| 1616 | 1616 | 'show' => $output['can_unapprove'] |
| 1617 | 1617 | ), |
| 1618 | 1618 | ), |
| 1619 | 1619 | 'quickmod' => array( |
| 1620 | 1620 | 'class' => 'inline_mod_check', |
| 1621 | - 'id' => 'in_topic_mod_check_'. $output['id'], |
|
| 1621 | + 'id' => 'in_topic_mod_check_' . $output['id'], |
|
| 1622 | 1622 | 'custom' => 'style="display: none;"', |
| 1623 | 1623 | 'content' => '', |
| 1624 | 1624 | 'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $output['can_remove'] |
@@ -149,16 +149,16 @@ discard block |
||
| 149 | 149 | { |
| 150 | 150 | global $context, $txt; |
| 151 | 151 | |
| 152 | - if (!in_array($txt[self::CLASS_KEY .'_settings'], $config_vars)) |
|
| 152 | + if (!in_array($txt[self::CLASS_KEY . '_settings'], $config_vars)) |
|
| 153 | 153 | { |
| 154 | - $config_vars[] = $txt[self::CLASS_KEY .'_settings']; |
|
| 154 | + $config_vars[] = $txt[self::CLASS_KEY . '_settings']; |
|
| 155 | 155 | $config_vars[] = array( |
| 156 | 156 | self::CLASS_KEY, |
| 157 | - $txt[self::CLASS_KEY .'_servers'], |
|
| 157 | + $txt[self::CLASS_KEY . '_servers'], |
|
| 158 | 158 | 'file', |
| 159 | 159 | 'text', |
| 160 | 160 | 0, |
| 161 | - 'subtext' => $txt[self::CLASS_KEY .'_servers_subtext']); |
|
| 161 | + 'subtext' => $txt[self::CLASS_KEY . '_servers_subtext']); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | if (!isset($context['settings_post_javascript'])) |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $context['settings_post_javascript'] .= ' |
| 168 | 168 | $("#cache_accelerator").change(function (e) { |
| 169 | 169 | var cache_type = e.currentTarget.value; |
| 170 | - $("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation"); |
|
| 170 | + $("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation"); |
|
| 171 | 171 | });'; |
| 172 | 172 | } |
| 173 | 173 | |
@@ -149,16 +149,16 @@ discard block |
||
| 149 | 149 | { |
| 150 | 150 | global $context, $txt; |
| 151 | 151 | |
| 152 | - if (!in_array($txt[self::CLASS_KEY .'_settings'], $config_vars)) |
|
| 152 | + if (!in_array($txt[self::CLASS_KEY . '_settings'], $config_vars)) |
|
| 153 | 153 | { |
| 154 | - $config_vars[] = $txt[self::CLASS_KEY .'_settings']; |
|
| 154 | + $config_vars[] = $txt[self::CLASS_KEY . '_settings']; |
|
| 155 | 155 | $config_vars[] = array( |
| 156 | 156 | self::CLASS_KEY, |
| 157 | - $txt[self::CLASS_KEY .'_servers'], |
|
| 157 | + $txt[self::CLASS_KEY . '_servers'], |
|
| 158 | 158 | 'file', |
| 159 | 159 | 'text', |
| 160 | 160 | 0, |
| 161 | - 'subtext' => $txt[self::CLASS_KEY .'_servers_subtext']); |
|
| 161 | + 'subtext' => $txt[self::CLASS_KEY . '_servers_subtext']); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | if (!isset($context['settings_post_javascript'])) |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $context['settings_post_javascript'] .= ' |
| 168 | 168 | $("#cache_accelerator").change(function (e) { |
| 169 | 169 | var cache_type = e.currentTarget.value; |
| 170 | - $("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation"); |
|
| 170 | + $("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation"); |
|
| 171 | 171 | });'; |
| 172 | 172 | } |
| 173 | 173 | |
@@ -1721,7 +1721,7 @@ discard block |
||
| 1721 | 1721 | { |
| 1722 | 1722 | // Avoid double separators and empty titled sections |
| 1723 | 1723 | $empty_section = true; |
| 1724 | - for ($j=$i+1; $j < count($context['theme_options']); $j++) |
|
| 1724 | + for ($j = $i + 1; $j < count($context['theme_options']); $j++) |
|
| 1725 | 1725 | { |
| 1726 | 1726 | // Found another separator, so we're done |
| 1727 | 1727 | if (!is_array($context['theme_options'][$j])) |
@@ -2700,8 +2700,7 @@ discard block |
||
| 2700 | 2700 | foreach ($context['post_errors'] as $error) |
| 2701 | 2701 | { |
| 2702 | 2702 | $text_key_error = $error == 'password_short' ? |
| 2703 | - sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : |
|
| 2704 | - (isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : ''); |
|
| 2703 | + sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : (isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : ''); |
|
| 2705 | 2704 | |
| 2706 | 2705 | echo ' |
| 2707 | 2706 | <li>', isset($txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>'; |