Skip to content

Q
question2answer
Commit 4234de91 by Scott
Options

Coding style (strict): control braces

parent 7c6b6de0
Showing with 94 additions and 57 deletions
qa-src/Controllers/User/UserPosts.php
......@@ -70,10 +70,11 @@ class UserPosts extends \Q2A\Controllers\BaseController
$qa_content = qa_content_prepare(true);
if (count($questions))
if (count($questions)) {
$qa_content['title'] = qa_lang_html_sub('profile/recent_activity_by_x', $this->userhtml);
else
} else {
$qa_content['title'] = qa_lang_html_sub('profile/no_posts_by_x', $this->userhtml);
}
// Recent activity by this user
......@@ -154,10 +155,11 @@ class UserPosts extends \Q2A\Controllers\BaseController
$qa_content = qa_content_prepare(true);
if (count($questions))
if (count($questions)) {
$qa_content['title'] = qa_lang_html_sub('profile/questions_by_x', $this->userhtml);
else
} else {
$qa_content['title'] = qa_lang_html_sub('profile/no_questions_by_x', $this->userhtml);
}
// Recent questions by this user
......@@ -240,10 +242,11 @@ class UserPosts extends \Q2A\Controllers\BaseController
$qa_content = qa_content_prepare(true);
if (count($questions))
if (count($questions)) {
$qa_content['title'] = qa_lang_html_sub('profile/answers_by_x', $this->userhtml);
else
} else {
$qa_content['title'] = qa_lang_html_sub('profile/no_answers_by_x', $this->userhtml);
}
// Recent questions by this user
......@@ -299,7 +302,8 @@ class UserPosts extends \Q2A\Controllers\BaseController
$usershtml = qa_get_users_html(array($this->userid), false, qa_path_to_root(), true);
$this->userhtml = @$usershtml[$this->userid];
} else
} else {
$this->userhtml = qa_html($handle);
}
}
}
qa-src/Controllers/User/UserProfile.php
......@@ -51,14 +51,16 @@ class UserProfile extends \Q2A\Controllers\BaseController
$usershtml = qa_get_users_html(array($userid), false, qa_path_to_root(), true);
$userhtml = @$usershtml[$userid];
} else
} else {
$userhtml = qa_html($handle);
}
// Redirect to 'My Account' page if button clicked
if (qa_clicked('doaccount'))
if (qa_clicked('doaccount')) {
qa_redirect('account');
}
// Find the user profile and questions and answers for this handle
......@@ -80,8 +82,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
if (!QA_FINAL_EXTERNAL_USERS && $handle !== qa_get_logged_in_handle()) {
foreach ($userfields as $index => $userfield) {
if (isset($userfield['permit']) && qa_permit_value_error($userfield['permit'], $loginuserid, qa_get_logged_in_level(), qa_get_logged_in_flags()))
if (isset($userfield['permit']) && qa_permit_value_error($userfield['permit'], $loginuserid, qa_get_logged_in_level(), qa_get_logged_in_flags())) {
unset($userfields[$index]); // don't pay attention to user fields we're not allowed to view
}
}
}
......@@ -92,7 +95,8 @@ class UserProfile extends \Q2A\Controllers\BaseController
$loginlevel = qa_get_logged_in_level();
if (!QA_FINAL_EXTERNAL_USERS) { // if we're using integrated user management, we can know and show more
// if we're using integrated user management, we can know and show more
if (!QA_FINAL_EXTERNAL_USERS) {
require_once QA_INCLUDE_DIR . 'app/messages.php';
if (!is_array($userpoints) && !is_array($useraccount)) { // check the user exists
......@@ -104,26 +108,30 @@ class UserProfile extends \Q2A\Controllers\BaseController
$maxlevelassign = null;
$maxuserlevel = $useraccount['level'];
foreach ($userlevels as $userlevel)
foreach ($userlevels as $userlevel) {
$maxuserlevel = max($maxuserlevel, $userlevel['level']);
}
if (isset($loginuserid) && $loginuserid != $userid &&
($loginlevel >= QA_USER_LEVEL_SUPER || $loginlevel > $maxuserlevel) &&
!qa_user_permit_error()
) { // can't change self - or someone on your level (or higher, obviously) unless you're a super admin
if ($loginlevel >= QA_USER_LEVEL_SUPER)
if ($loginlevel >= QA_USER_LEVEL_SUPER) {
$maxlevelassign = QA_USER_LEVEL_SUPER;
elseif ($loginlevel >= QA_USER_LEVEL_ADMIN)
} elseif ($loginlevel >= QA_USER_LEVEL_ADMIN) {
$maxlevelassign = QA_USER_LEVEL_MODERATOR;
elseif ($loginlevel >= QA_USER_LEVEL_MODERATOR)
} elseif ($loginlevel >= QA_USER_LEVEL_MODERATOR) {
$maxlevelassign = QA_USER_LEVEL_EXPERT;
}
if ($loginlevel >= QA_USER_LEVEL_ADMIN)
if ($loginlevel >= QA_USER_LEVEL_ADMIN) {
$fieldseditable = true;
}
if (isset($maxlevelassign) && ($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED))
if (isset($maxlevelassign) && ($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED)) {
$maxlevelassign = min($maxlevelassign, QA_USER_LEVEL_EDITOR); // if blocked, can't promote too high
}
}
$approvebutton = isset($maxlevelassign)
......@@ -143,9 +151,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
foreach ($usermessages as $message) {
if ($message['deleteable'] && qa_clicked('m' . $message['messageid'] . '_dodelete')) {
if (!qa_check_form_security_code('wall-' . $useraccount['handle'], qa_post_text('code')))
if (!qa_check_form_security_code('wall-' . $useraccount['handle'], qa_post_text('code'))) {
$errors['page'] = qa_lang_html('misc/form_security_again');
else {
} else {
qa_wall_delete_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $message);
qa_redirect(qa_request(), null, null, null, 'wall');
}
......@@ -171,8 +179,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
$inemail = qa_post_text('email');
$inprofile = array();
foreach ($userfields as $userfield)
foreach ($userfields as $userfield) {
$inprofile[$userfield['fieldid']] = qa_post_text('field_' . $userfield['fieldid']);
}
if (!qa_check_form_security_code('user-edit-' . $handle, qa_post_text('code'))) {
$errors['page'] = qa_lang_html('misc/form_security_again');
......@@ -206,17 +215,20 @@ class UserProfile extends \Q2A\Controllers\BaseController
if (count($inprofile)) {
$filtermodules = qa_load_modules_with('filter', 'filter_profile');
foreach ($filtermodules as $filtermodule)
foreach ($filtermodules as $filtermodule) {
$filtermodule->filter_profile($inprofile, $errors, $useraccount, $userprofile);
}
}
foreach ($userfields as $userfield) {
if (!isset($errors[$userfield['fieldid']]))
if (!isset($errors[$userfield['fieldid']])) {
qa_db_user_profile_set($userid, $userfield['title'], $inprofile[$userfield['fieldid']]);
}
}
if (count($errors))
if (count($errors)) {
$userediting = true;
}
qa_report_event('u_edit', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(
'userid' => $userid,
......@@ -226,16 +238,18 @@ class UserProfile extends \Q2A\Controllers\BaseController
if (isset($maxlevelassign)) {
$inlevel = min($maxlevelassign, (int)qa_post_text('level')); // constrain based on maximum permitted to prevent simple browser-based attack
if ($inlevel != $useraccount['level'])
if ($inlevel != $useraccount['level']) {
qa_set_user_level($userid, $useraccount['handle'], $inlevel, $useraccount['level']);
}
if (qa_using_categories()) {
$inuserlevels = array();
for ($index = 1; $index <= 999; $index++) {
$inlevel = qa_post_text('uc_' . $index . '_level');
if (!isset($inlevel))
if (!isset($inlevel)) {
break;
}
$categoryid = qa_get_category_field_value('uc_' . $index . '_cat');
......@@ -252,8 +266,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
}
}
if (empty($errors))
if (empty($errors)) {
qa_redirect(qa_request());
}
list($useraccount, $userprofile, $userlevels) = qa_db_select_with_pending(
qa_db_user_account_selectspec($userid, true),
......@@ -295,8 +310,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
$postids = qa_db_get_user_visible_postids($userid);
foreach ($postids as $postid)
foreach ($postids as $postid) {
qa_post_set_status($postid, QA_POST_STATUS_HIDDEN, $loginuserid);
}
qa_redirect(qa_request());
}
......@@ -414,8 +430,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
),
);
if (empty($qa_content['form_profile']['fields']['avatar']['html']))
if (empty($qa_content['form_profile']['fields']['avatar']['html'])) {
unset($qa_content['form_profile']['fields']['avatar']);
}
// Private message link
......@@ -435,8 +452,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
$qa_content['form_profile']['fields']['level']['type'] = 'select';
$showlevels = array(QA_USER_LEVEL_BASIC);
if (qa_opt('moderate_users'))
if (qa_opt('moderate_users')) {
$showlevels[] = QA_USER_LEVEL_APPROVED;
}
array_push($showlevels, QA_USER_LEVEL_EXPERT, QA_USER_LEVEL_EDITOR, QA_USER_LEVEL_MODERATOR, QA_USER_LEVEL_ADMIN, QA_USER_LEVEL_SUPER);
......@@ -446,8 +464,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
foreach ($showlevels as $showlevel) {
if ($showlevel <= $maxlevelassign) {
$leveloptions[$showlevel] = qa_html(qa_user_level_string($showlevel));
if ($showlevel > QA_USER_LEVEL_BASIC)
if ($showlevel > QA_USER_LEVEL_BASIC) {
$catleveloptions[$showlevel] = $leveloptions[$showlevel];
}
}
}
......@@ -468,8 +487,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
$qa_content['form_profile']['fields']['level']['suffix'] = qa_lang_html('users/level_in_general');
}
if ($catleveladd || count($userlevels))
if ($catleveladd || count($userlevels)) {
$userlevels[] = array('entitytype' => QA_ENTITY_CATEGORY);
}
$index = 0;
foreach ($userlevels as $userlevel) {
......@@ -488,10 +508,11 @@ class UserProfile extends \Q2A\Controllers\BaseController
$qa_content['form_profile']['fields']['uc_' . $index . '_cat'] = array();
if (isset($userlevel['entityid']))
if (isset($userlevel['entityid'])) {
$fieldnavcategories = qa_db_select_with_pending(qa_db_category_nav_selectspec($userlevel['entityid'], true));
else
} else {
$fieldnavcategories = $navcategories;
}
qa_set_up_category_field(
$qa_content,
......@@ -558,10 +579,11 @@ class UserProfile extends \Q2A\Controllers\BaseController
if (qa_permit_error($permitoption, $userid, QA_USER_LEVEL_APPROVED, QA_USER_FLAGS_EMAIL_CONFIRMED, 0) &&
!qa_permit_error($permitoption, $userid, $useraccount['level'], $useraccount['flags'], $userpoints['points'])
) {
if ($permitoption == 'permit_retag_cat')
if ($permitoption == 'permit_retag_cat') {
$showpermits[] = qa_lang(qa_using_categories() ? 'profile/permit_recat' : 'profile/permit_retag');
else
} else {
$showpermits[] = qa_lang('profile/' . $permitoption); // then show it as an extra priviliege
}
}
}
......@@ -638,26 +660,29 @@ class UserProfile extends \Q2A\Controllers\BaseController
$valuehtml = qa_url_to_html_link(@$userprofile[$userfield['title']], qa_opt('links_in_new_window'));
} else {
$value = @$inprofile[$userfield['fieldid']];
if (!isset($value))
if (!isset($value)) {
$value = @$userprofile[$userfield['title']];
}
$valuehtml = qa_html($value, (($userfield['flags'] & QA_FIELD_FLAGS_MULTI_LINE) && !$fieldsediting));
}
$label = trim(qa_user_userfield_label($userfield), ':');
if (strlen($label))
if (strlen($label)) {
$label .= ':';
}
$notehtml = null;
if (isset($userfield['permit']) && !$userediting) {
if ($userfield['permit'] <= QA_PERMIT_ADMINS)
if ($userfield['permit'] <= QA_PERMIT_ADMINS) {
$notehtml = qa_lang_html('users/only_shown_admins');
elseif ($userfield['permit'] <= QA_PERMIT_MODERATORS)
} elseif ($userfield['permit'] <= QA_PERMIT_MODERATORS) {
$notehtml = qa_lang_html('users/only_shown_moderators');
elseif ($userfield['permit'] <= QA_PERMIT_EDITORS)
} elseif ($userfield['permit'] <= QA_PERMIT_EDITORS) {
$notehtml = qa_lang_html('users/only_shown_editors');
elseif ($userfield['permit'] <= QA_PERMIT_EXPERTS)
} elseif ($userfield['permit'] <= QA_PERMIT_EXPERTS) {
$notehtml = qa_lang_html('users/only_shown_experts');
}
}
$qa_content['form_profile']['fields'][$userfield['title']] = array(
......@@ -758,8 +783,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
}
if (!is_array($qa_content['form_profile']['fields']['removeavatar']))
if (!is_array($qa_content['form_profile']['fields']['removeavatar'])) {
unset($qa_content['form_profile']['fields']['removeavatar']);
}
$qa_content['raw']['account'] = $useraccount; // for plugin layers to access
$qa_content['raw']['profile'] = $userprofile;
......@@ -832,8 +858,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
unset($qa_content['form_activity']['fields']['bonus']);
}
if (!isset($qa_content['form_activity']['fields']['title']['value']))
if (!isset($qa_content['form_activity']['fields']['title']['value'])) {
unset($qa_content['form_activity']['fields']['title']);
}
if (qa_opt('comment_on_qs') || qa_opt('comment_on_as')) { // only show comment count if comments are enabled
$qa_content['form_activity']['fields']['comments'] = array(
......@@ -854,8 +881,9 @@ class UserProfile extends \Q2A\Controllers\BaseController
$votedonvalue .= ($qvotes == 1) ? qa_lang_html_sub('main/1_question', $innervalue, '1')
: qa_lang_html_sub('main/x_questions', $innervalue);
if (qa_opt('voting_on_as'))
if (qa_opt('voting_on_as')) {
$votedonvalue .= ', ';
}
}
if (qa_opt('voting_on_as')) {
......@@ -971,11 +999,13 @@ class UserProfile extends \Q2A\Controllers\BaseController
);
}
foreach ($usermessages as $message)
foreach ($usermessages as $message) {
$qa_content['message_list']['messages'][] = qa_wall_post_view($message);
}
if ($useraccount['wallposts'] > count($usermessages))
if ($useraccount['wallposts'] > count($usermessages)) {
$qa_content['message_list']['messages'][] = qa_wall_view_more_link($handle, count($usermessages));
}
}
......
qa-src/Database/DbConnection.php
......@@ -266,8 +266,9 @@ class DbConnection
if ($cacheDriver->isEnabled()) {
$queryData = $cacheDriver->get($cacheKey);
if ($queryData !== null)
if ($queryData !== null) {
return $queryData;
}
}
}
......@@ -311,8 +312,9 @@ class DbConnection
if (!QA_OPTIMIZE_DISTANT_DB || count($selectspecs) <= 1) {
$outresults = array();
foreach ($selectspecs as $selectkey => $selectspec)
foreach ($selectspecs as $selectkey => $selectspec) {
$outresults[$selectkey] = $this->singleSelect($selectspec);
}
return $outresults;
}
......@@ -390,21 +392,24 @@ class DbConnection
$rawresults = $stmt->fetchAllAssoc();
$outresults = array();
foreach ($selectspecs as $selectkey => $selectspec)
foreach ($selectspecs as $selectkey => $selectspec) {
$outresults[$selectkey] = array();
}
foreach ($rawresults as $rawresult) {
$selectkey = $rawresult['selectkey'];
$selectspec = $selectspecs[$selectkey];
$keepresult = array();
foreach ($selectspec['outcolumns'] as $columnas => $columnfrom)
foreach ($selectspec['outcolumns'] as $columnas => $columnfrom) {
$keepresult[$columnas] = $rawresult[$columnas];
}
if (isset($selectspec['arraykey']))
if (isset($selectspec['arraykey'])) {
$outresults[$selectkey][$keepresult[$selectspec['arraykey']]] = $keepresult;
else
} else {
$outresults[$selectkey][] = $keepresult;
}
}
// Post-processing to apply various stuff include sorting request, since we can't rely on ORDER BY due to UNION
......@@ -442,8 +447,9 @@ class DbConnection
qa_sort_by($outresult, $selectspec['sortdesc'], $selectspec['sortdesc_2']);
} else {
$index = count($outresult);
foreach ($outresult as $key => $value)
foreach ($outresult as $key => $value) {
$outresult[$key]['_order_'] = $index--;
}
qa_sort_by($outresult, $selectspec['sortdesc'], '_order_');
}
......
qa-src/Storage/CacheFactory.php
......@@ -40,8 +40,7 @@ class CacheFactory
$driver = qa_opt('caching_driver');
switch($driver)
{
switch ($driver) {
case 'memcached':
self::$cacheDriver = new MemcachedDriver($config);
break;
......
qa-tests/phpcs/ruleset-strict.xml
......@@ -13,8 +13,6 @@
<rule ref="PSR2">
<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
<exclude name="Generic.Files.LineLength.TooLong"/>
<exclude name="Generic.ControlStructures.InlineControlStructure"/>
<exclude name="Squiz.ControlStructures.ControlSignature"/> <!-- doesn't work without above rule -->
</rule>
<arg name="tab-width" value="4"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment