Skip to content

Q
question2answer
Commit 23eaf7ac by Scott
Options

Update all qa-db-* includes

parent 0b69d140
Showing with 197 additions and 197 deletions
qa-include/ajax/answer.php
......@@ -26,7 +26,7 @@
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Load relevant information about this question
......
qa-include/ajax/asktitle.php
......@@ -24,7 +24,7 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/ajax/category.php
......@@ -24,7 +24,7 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$categoryid=qa_post_text('categoryid');
......
qa-include/ajax/click-answer.php
......@@ -27,7 +27,7 @@
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
......
qa-include/ajax/click-comment.php
......@@ -27,7 +27,7 @@
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
......
qa-include/ajax/click-pm.php
......@@ -27,7 +27,7 @@
require_once QA_INCLUDE_DIR.'app/messages.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$loginUserId = qa_get_logged_in_userid();
......
qa-include/ajax/click-wall.php
......@@ -27,7 +27,7 @@
require_once QA_INCLUDE_DIR.'app/messages.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$tohandle=qa_post_text('handle');
......
qa-include/ajax/comment.php
......@@ -26,7 +26,7 @@
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Load relevant information about this question and the comment parent
......
qa-include/ajax/notice.php
......@@ -25,8 +25,8 @@
*/
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-db-notices.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/notices.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$noticeid=qa_post_text('noticeid');
......
qa-include/ajax/show-comments.php
......@@ -24,7 +24,7 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/ajax/vote.php
......@@ -29,7 +29,7 @@
require_once QA_INCLUDE_DIR.'app/votes.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$postid=qa_post_text('postid');
......
qa-include/ajax/wallpost.php
......@@ -27,7 +27,7 @@
require_once QA_INCLUDE_DIR.'app/messages.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$message=qa_post_text('message');
......
qa-include/app/admin.php
......@@ -406,8 +406,8 @@
Return the error that needs to displayed on all admin pages, or null if none
*/
{
if (file_exists(QA_INCLUDE_DIR.'qa-db-install.php')) // file can be removed for extra security
include_once QA_INCLUDE_DIR.'qa-db-install.php';
if (file_exists(QA_INCLUDE_DIR.'db/install.php')) // file can be removed for extra security
include_once QA_INCLUDE_DIR.'db/install.php';
if (defined('QA_DB_VERSION_CURRENT') && (qa_opt('db_version')<QA_DB_VERSION_CURRENT) && (qa_get_logged_in_level()>=QA_USER_LEVEL_ADMIN))
return strtr(
......@@ -482,7 +482,7 @@
$userid=qa_get_logged_in_userid();
if ( (!QA_FINAL_EXTERNAL_USERS) && (($action=='userapprove') || ($action=='userblock')) ) { // approve/block moderated users
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$useraccount=qa_db_select_with_pending(qa_db_user_account_selectspec($entityid, true));
......
qa-include/app/blobs.php
......@@ -71,7 +71,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
require_once QA_INCLUDE_DIR.'db/blobs.php';
$blobid=qa_db_blob_create(defined('QA_BLOBS_DIRECTORY') ? null : $content, $format, $sourcefilename, $userid, $cookieid, $ip);
......@@ -119,7 +119,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
require_once QA_INCLUDE_DIR.'db/blobs.php';
$blob=qa_db_blob_read($blobid);
......@@ -148,7 +148,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
require_once QA_INCLUDE_DIR.'db/blobs.php';
if (defined('QA_BLOBS_DIRECTORY')) {
$blob=qa_db_blob_read($blobid);
......@@ -179,7 +179,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
require_once QA_INCLUDE_DIR.'db/blobs.php';
return qa_db_blob_exists($blobid);
}
......
qa-include/app/cookies.php
......@@ -49,7 +49,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-cookies.php';
require_once QA_INCLUDE_DIR.'db/cookies.php';
$cookieid=qa_cookie_get();
......@@ -71,7 +71,7 @@
relating to $questionid, $answerid and/or $commentid
*/
{
require_once QA_INCLUDE_DIR.'qa-db-cookies.php';
require_once QA_INCLUDE_DIR.'db/cookies.php';
qa_db_cookie_written($cookieid, qa_remote_ip_address());
}
......
qa-include/app/emails.php
......@@ -58,7 +58,7 @@
if ($qa_notifications_suspended>0)
return false;
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
if (isset($userid)) {
......
qa-include/app/events.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-events.php';
require_once QA_INCLUDE_DIR.'db/events.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
......@@ -60,7 +60,7 @@
*/
{
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'qa-db-post-create.php';
require_once QA_INCLUDE_DIR.'db/post-create.php';
$tagwordids=qa_db_word_mapto_ids(array_unique(qa_tagstring_to_tags($tagstring)));
foreach ($tagwordids as $wordid)
......@@ -77,7 +77,7 @@
*/
{
if (isset($categoryid)) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$categories=qa_category_path(qa_db_single_select(qa_db_category_nav_selectspec($categoryid, true)), $categoryid);
......
qa-include/app/favorites.php
......@@ -42,7 +42,7 @@
*/
function qa_user_favorite_set($userid, $handle, $cookieid, $entitytype, $entityid, $favorite)
{
require_once QA_INCLUDE_DIR.'qa-db-favorites.php';
require_once QA_INCLUDE_DIR.'db/favorites.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
......
qa-include/app/format.php
......@@ -144,7 +144,7 @@
$loginuserid=qa_get_logged_in_userid();
if (isset($loginuserid)) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
$favoritenonqs=qa_db_get_pending_result('favoritenonqs', qa_db_user_favorite_non_qs_selectspec($loginuserid));
......
qa-include/app/limits.php
......@@ -64,7 +64,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-limits.php';
require_once QA_INCLUDE_DIR.'db/limits.php';
$dblimits=qa_db_limits_get($userid, qa_remote_ip_address(), $action);
......@@ -205,7 +205,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-limits.php';
require_once QA_INCLUDE_DIR.'db/limits.php';
$period=(int)(qa_opt('db_time')/3600);
......
qa-include/app/mailing.php
......@@ -35,7 +35,7 @@
Start a mailing to all users, unless one has already been started
*/
{
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
if (strlen(qa_opt('mailing_last_userid'))==0) {
qa_opt('mailing_last_timestamp', time());
......@@ -63,7 +63,7 @@
Allow the mailing to proceed forwards, for the appropriate amount of time and users, based on the options
*/
{
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$lastuserid=qa_opt('mailing_last_userid');
......@@ -115,7 +115,7 @@
*/
{
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
if (!strlen(trim($emailcode))) {
$emailcode=qa_db_user_rand_emailcode();
......
qa-include/app/messages.php
......@@ -82,7 +82,7 @@
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'qa-db-messages.php';
require_once QA_INCLUDE_DIR.'db/messages.php';
$messageid = qa_db_message_create($userid, $touserid, $content, $format, true);
qa_db_user_recount_posts($touserid);
......@@ -106,7 +106,7 @@
by user $userid with handle $handle, and $cookieid is the user's current cookie (all used for reporting the event).
*/
{
require_once QA_INCLUDE_DIR.'qa-db-messages.php';
require_once QA_INCLUDE_DIR.'db/messages.php';
qa_db_message_delete($message['messageid']);
qa_db_user_recount_posts($message['touserid']);
......@@ -195,7 +195,7 @@
Note: currently no event is reported here, so $handle/$cookieid are unused.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-messages.php';
require_once QA_INCLUDE_DIR.'db/messages.php';
qa_db_message_user_hide($message['messageid'], $box);
qa_db_message_delete($message['messageid'], false);
......
qa-include/app/options.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-options.php';
require_once QA_INCLUDE_DIR.'db/options.php';
define('QA_PERMIT_ALL', 150);
define('QA_PERMIT_USERS', 120);
......@@ -59,7 +59,7 @@
qa_preload_options();
if (!$qa_options_loaded) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
qa_load_options_results(array(
qa_db_get_pending_result('options'),
......@@ -139,7 +139,7 @@
);
if (QA_OPTIMIZE_DISTANT_DB) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
foreach ($selectspecs as $pendingid => $selectspec)
qa_db_queue_pending_select($pendingid, $selectspec);
......
qa-include/app/post-create.php
......@@ -29,10 +29,10 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'qa-db-post-create.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'qa-db-hotness.php';
require_once QA_INCLUDE_DIR.'db/maxima.php';
require_once QA_INCLUDE_DIR.'db/post-create.php';
require_once QA_INCLUDE_DIR.'db/points.php';
require_once QA_INCLUDE_DIR.'db/hotness.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
......@@ -53,14 +53,14 @@
See qa-app-posts.php for a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$postid=qa_db_post_create($queued ? 'Q_QUEUED' : 'Q', @$followanswer['postid'], $userid, isset($userid) ? null : $cookieid,
qa_remote_ip_address(), $title, $content, $format, $tagstring, qa_combine_notify_email($userid, $notify, $email),
$categoryid, isset($userid) ? null : $name);
if (isset($extravalue)) {
require_once QA_INCLUDE_DIR.'qa-db-metas.php';
require_once QA_INCLUDE_DIR.'db/metas.php';
qa_db_postmeta_set($postid, 'qa_q_extra', $extravalue);
}
......
qa-include/app/post-update.php
......@@ -31,10 +31,10 @@
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
require_once QA_INCLUDE_DIR.'qa-db-post-create.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'qa-db-hotness.php';
require_once QA_INCLUDE_DIR.'db/post-create.php';
require_once QA_INCLUDE_DIR.'db/post-update.php';
require_once QA_INCLUDE_DIR.'db/points.php';
require_once QA_INCLUDE_DIR.'db/hotness.php';
define('QA_POST_STATUS_NORMAL', 0);
......@@ -65,7 +65,7 @@
($titlechanged || $contentchanged) ? QA_UPDATE_CONTENT : QA_UPDATE_TAGS, $name);
if (isset($extravalue)) {
require_once QA_INCLUDE_DIR.'qa-db-metas.php';
require_once QA_INCLUDE_DIR.'db/metas.php';
qa_db_postmeta_set($oldquestion['postid'], 'qa_q_extra', $extravalue);
}
......@@ -367,7 +367,7 @@
));
if ($wasqueued && ($status==QA_POST_STATUS_NORMAL) && !$wasrequeued) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
qa_report_event('q_post', $oldquestion['userid'], $oldquestion['handle'], $oldquestion['cookieid'], $eventparams + array(
......@@ -436,7 +436,7 @@
See qa-app-posts.php for a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
if ($oldquestion['type']!='Q_HIDDEN')
qa_fatal_error('Tried to delete a non-hidden question');
......@@ -477,7 +477,7 @@
of user. Updates points and reports events as appropriate.
*/
{
require_once QA_INCLUDE_DIR . 'qa-db-votes.php';
require_once QA_INCLUDE_DIR . 'db/votes.php';
$postid = $oldquestion['postid'];
......@@ -699,7 +699,7 @@
See qa-app-posts.php for a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
if ($oldanswer['type']!='A_HIDDEN')
qa_fatal_error('Tried to delete a non-hidden answer');
......@@ -740,7 +740,7 @@
of user. Updates points and reports events as appropriate.
*/
{
require_once QA_INCLUDE_DIR . 'qa-db-votes.php';
require_once QA_INCLUDE_DIR . 'db/votes.php';
$postid = $oldanswer['postid'];
......@@ -833,7 +833,7 @@
Handles indexing (based on $text), user points, cached counts and event reports.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
$parent=isset($answers[$parentid]) ? $answers[$parentid] : $question;
......@@ -1002,7 +1002,7 @@
));
if ($wasqueued && ($status==QA_POST_STATUS_NORMAL) && !$wasrequeued) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
$commentsfollows=qa_db_single_select(qa_db_full_child_posts_selectspec(null, $oldcomment['parentid']));
......@@ -1061,7 +1061,7 @@
of user. Updates points and reports events as appropriate.
*/
{
require_once QA_INCLUDE_DIR . 'qa-db-votes.php';
require_once QA_INCLUDE_DIR . 'db/votes.php';
$postid = $oldcomment['postid'];
......
qa-include/app/posts.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'app/post-update.php';
......
qa-include/app/recalc.php
......@@ -65,12 +65,12 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-recalc.php';
require_once QA_INCLUDE_DIR.'qa-db-post-create.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/recalc.php';
require_once QA_INCLUDE_DIR.'db/post-create.php';
require_once QA_INCLUDE_DIR.'db/points.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'app/post-update.php';
......@@ -487,7 +487,7 @@
if (isset($blob)) {
require_once QA_INCLUDE_DIR.'app/blobs.php';
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
require_once QA_INCLUDE_DIR.'db/blobs.php';
if (qa_write_blob_file($blob['blobid'], $blob['content'], $blob['format']))
qa_db_blob_set_content($blob['blobid'], null);
......@@ -509,7 +509,7 @@
if (isset($blob)) {
require_once QA_INCLUDE_DIR.'app/blobs.php';
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
require_once QA_INCLUDE_DIR.'db/blobs.php';
$content=qa_read_blob_file($blob['blobid'], $blob['format']);
qa_db_blob_set_content($blob['blobid'], $content);
......
qa-include/app/users-edit.php
......@@ -39,7 +39,7 @@
to all filter modules and also rejects existing values in database unless they belongs to $olduser (if set).
*/
{
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$errors=array();
......@@ -86,8 +86,8 @@
*/
{
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/maxima.php';
require_once QA_INCLUDE_DIR.'db/users.php';
if (!strlen($handle))
$handle=qa_lang('users/registered_user');
......@@ -158,8 +158,8 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'db/points.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
......@@ -214,10 +214,10 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'db/post-update.php';
require_once QA_INCLUDE_DIR.'db/points.php';
$postids=qa_db_uservoteflag_user_get($userid); // posts this user has flagged or voted on, whose counts need updating
......@@ -244,8 +244,8 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
$userinfo=qa_db_select_with_pending(qa_db_user_account_selectspec($userid, true));
......@@ -264,7 +264,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$emailcode=qa_db_user_rand_emailcode();
qa_db_user_set($userid, 'emailcode', $emailcode);
......@@ -280,7 +280,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
qa_db_user_set_flag($userid, QA_USER_FLAGS_EMAIL_CONFIRMED, true);
......@@ -299,7 +299,7 @@
Pass the previous user level in $oldlevel. Reports the appropriate event, assumes change performed by the logged in user.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
qa_db_user_set($userid, 'level', $level);
qa_db_uapprovecount_update();
......@@ -322,7 +322,7 @@
event, assumes change performed by the logged in user.
*/
{
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
qa_db_user_set_flag($userid, QA_USER_FLAGS_USER_BLOCKED, $blocked);
qa_db_uapprovecount_update();
......@@ -341,10 +341,10 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
qa_db_user_set($userid, 'emailcode', qa_db_user_rand_emailcode());
......@@ -369,7 +369,7 @@
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$password=qa_random_alphanum(max(QA_MIN_PASSWORD_LEN, QA_NEW_PASSWORD_LEN));
......
qa-include/app/users.php
......@@ -112,7 +112,7 @@
global $qa_cached_logged_in_points;
if (!isset($qa_cached_logged_in_points)) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$qa_cached_logged_in_points=qa_db_select_with_pending(qa_db_user_points_selectspec(qa_get_logged_in_userid(), true));
}
......@@ -249,7 +249,7 @@
// Logging in from a second browser will make the previous browser's 'Remember me' no longer
// work - I'm not sure if this is the right behavior - could see it either way.
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$userinfo=qa_db_single_select(qa_db_user_account_selectspec($userid, true));
......@@ -288,7 +288,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$users=qa_db_user_login_find($source, $identifier);
$countusers=count($users);
......@@ -373,7 +373,7 @@
// Try to recover session from the database if PHP session has timed out
if ( (!isset($_SESSION['qa_session_userid_'.$suffix])) && (!empty($handle)) && (!empty($sessioncode)) ) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$userinfo=qa_db_single_select(qa_db_user_account_selectspec($handle, false)); // don't get any pending
......@@ -418,7 +418,7 @@
$userid=qa_get_logged_in_userid();
if (isset($userid) && !isset($qa_cached_logged_in_user)) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$qa_cached_logged_in_user=qa_db_get_pending_result('loggedinuser', qa_db_user_account_selectspec($userid, true));
if (!isset($qa_cached_logged_in_user)) {
......@@ -511,7 +511,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
qa_db_user_written($userid, qa_remote_ip_address());
}
......@@ -613,7 +613,7 @@
Return an array of all the specific (e.g. per category) level privileges for the logged in user, retrieving from the database if necessary
*/
{
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
return qa_db_get_pending_result('userlevels', qa_db_user_levels_selectspec(qa_get_logged_in_userid(), true));
}
......@@ -628,7 +628,7 @@
$rawuseridhandles=qa_get_public_from_userids($userids);
else {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$rawuseridhandles=qa_db_user_get_userid_handles($userids);
}
......@@ -663,7 +663,7 @@
$rawhandleuserids=qa_get_userids_from_public($handles);
else {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$rawhandleuserids=qa_db_user_get_handle_userids($handles);
}
......@@ -695,7 +695,7 @@
$handleuserids=qa_get_userids_from_public(array($handle));
else {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$handleuserids=qa_db_user_get_handle_userids(array($handle));
}
......
qa-include/app/votes.php
......@@ -90,10 +90,10 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'qa-db-hotness.php';
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'qa-db-post-create.php';
require_once QA_INCLUDE_DIR.'db/points.php';
require_once QA_INCLUDE_DIR.'db/hotness.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
require_once QA_INCLUDE_DIR.'db/post-create.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
$vote=(int)min(1, max(-1, $vote));
......@@ -151,7 +151,7 @@
// The 'login', 'confirm', 'limit', 'userblock' and 'ipblock' permission errors are reported to the user here.
// Others ('approve', 'level') prevent the flag button being shown, in qa_page_q_post_rules(...)
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
......@@ -197,9 +197,9 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
require_once QA_INCLUDE_DIR.'db/post-update.php';
qa_db_userflag_set($oldpost['postid'], $userid, true);
qa_db_post_recount_flags($oldpost['postid']);
......@@ -241,9 +241,9 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
require_once QA_INCLUDE_DIR.'db/post-update.php';
qa_db_userflag_set($oldpost['postid'], $userid, false);
qa_db_post_recount_flags($oldpost['postid']);
......@@ -278,9 +278,9 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
require_once QA_INCLUDE_DIR.'db/post-update.php';
qa_db_userflags_clear_all($oldpost['postid']);
qa_db_post_recount_flags($oldpost['postid']);
......
qa-include/modules/qa-event-updates.php
......@@ -37,7 +37,7 @@
if (@$params['silent']) // don't create updates about silent edits, and possibly other silent events in future
return;
require_once QA_INCLUDE_DIR.'qa-db-events.php';
require_once QA_INCLUDE_DIR.'db/events.php';
require_once QA_INCLUDE_DIR.'app/events.php';
switch ($event) {
......
qa-include/modules/qa-filter-basic.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'db/maxima.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
......
qa-include/modules/qa-search-basic.php
......@@ -34,7 +34,7 @@
public function index_post($postid, $type, $questionid, $parentid, $title, $content, $format, $text, $tagstring, $categoryid)
{
require_once QA_INCLUDE_DIR.'qa-db-post-create.php';
require_once QA_INCLUDE_DIR.'db/post-create.php';
// Get words from each textual element
......@@ -84,7 +84,7 @@
public function unindex_post($postid)
{
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
require_once QA_INCLUDE_DIR.'db/post-update.php';
$titlewordids=qa_db_titlewords_get_post_wordids($postid);
qa_db_titlewords_delete_post($postid);
......@@ -124,7 +124,7 @@
public function process_search($query, $start, $count, $userid, $absoluteurls, $fullcontent)
{
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
$words=qa_string_to_words($query);
......
qa-include/modules/qa-widget-related-qs.php
......@@ -40,7 +40,7 @@
public function output_widget($region, $place, $themeobject, $template, $request, $qa_content)
{
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
if (@$qa_content['q_view']['raw']['type']!='Q') // question might not be visible, etc...
return;
......
qa-include/pages/account.php
......@@ -29,10 +29,10 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-image.php';
......@@ -70,7 +70,7 @@
$errors['avatar'] = qa_lang('main/file_upload_limit_exceeded');
else {
if (qa_clicked('dosaveprofile') && !$isblocked) {
require_once QA_INCLUDE_DIR . 'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR . 'app/users-edit.php';
$inhandle = $changehandle ? qa_post_text('handle') : $useraccount['handle'];
$inemail = qa_post_text('email');
......@@ -120,7 +120,7 @@
if ($avatarfileerror === 1)
$errors['avatar'] = qa_lang('main/file_upload_limit_exceeded');
elseif ($avatarfileerror === 0 && $_FILES['file']['size'] > 0) {
require_once QA_INCLUDE_DIR . 'qa-app-limits.php';
require_once QA_INCLUDE_DIR . 'app/limits.php';
switch (qa_user_permit_error(null, QA_LIMIT_UPLOADS)) {
case 'limit':
......@@ -172,7 +172,7 @@
// Process change password if clicked
if (qa_clicked('dochangepassword')) {
require_once QA_INCLUDE_DIR . 'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR . 'app/users-edit.php';
$inoldpassword = qa_post_text('oldpassword');
$innewpassword1 = qa_post_text('newpassword1');
......
qa-include/pages/activity.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/admin/admin-approve.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
// Check we're not using single-sign on integration
......
qa-include/pages/admin/admin-categories.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
// Get relevant list of categories
......
qa-include/pages/admin/admin-default.php
......@@ -29,9 +29,9 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'db/maxima.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
......@@ -710,7 +710,7 @@
break;
case 'block_ips_write':
require_once QA_INCLUDE_DIR . 'qa-app-limits.php';
require_once QA_INCLUDE_DIR . 'app/limits.php';
$optionvalue = implode(' , ', qa_block_ips_explode($optionvalue));
break;
......@@ -746,7 +746,7 @@
$imagedata = qa_image_constrain_data(file_get_contents($_FILES['avatar_default_file']['tmp_name']), $width, $height, qa_opt('avatar_store_size'));
if (isset($imagedata)) {
require_once QA_INCLUDE_DIR . 'qa-app-blobs.php';
require_once QA_INCLUDE_DIR . 'app/blobs.php';
$newblobid = qa_create_blob($imagedata, 'jpeg');
......
qa-include/pages/admin/admin-flagged.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/admin/admin-hidden.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/admin/admin-moderate.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/admin/admin-pages.php
......@@ -31,7 +31,7 @@
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Get current list of pages and determine the state of this admin page
......@@ -114,7 +114,7 @@
qa_set_option($optionname, (int)qa_post_text('option_'.$optionname));
} elseif (qa_clicked('dosavepage')) {
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
if (!qa_check_form_security_code('admin/pages', qa_post_text('code')))
......
qa-include/pages/admin/admin-points.php
......@@ -29,8 +29,8 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-recalc.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'db/recalc.php';
require_once QA_INCLUDE_DIR.'db/points.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-util-sort.php';
......
qa-include/pages/admin/admin-stats.php
......@@ -29,9 +29,9 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-recalc.php';
require_once QA_INCLUDE_DIR.'db/recalc.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
// Check admin privileges (do late to allow one DB query)
......
qa-include/pages/admin/admin-userfields.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Get current list of user fields and determine the state of this admin page
......@@ -61,7 +61,7 @@
qa_redirect('admin/users');
elseif (qa_clicked('dosavefield')) {
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
if (!qa_check_form_security_code('admin/userfields', qa_post_text('code')))
......
qa-include/pages/admin/admin-usertitles.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Get current list of user titles and determine the state of this admin page
......
qa-include/pages/admin/admin-widgets.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Get current list of widgets and determine the state of this admin page
......@@ -122,7 +122,7 @@
qa_redirect('admin/layout');
elseif (qa_clicked('dosavewidget')) {
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
if (!qa_check_form_security_code('admin/widgets', qa_post_text('code')))
$securityexpired=true;
......
qa-include/pages/answers.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/ask.php
......@@ -32,7 +32,7 @@
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-sort.php';
......@@ -135,7 +135,7 @@
$errors['categoryid']=qa_lang_html('question/category_ask_not_allowed');
if ($captchareason) {
require_once 'qa-app-captcha.php';
require_once QA_INCLUDE_DIR . 'app/captcha.php';
qa_captcha_validate_post($errors);
}
......@@ -275,7 +275,7 @@
isset($in['notify']) ? $in['notify'] : qa_opt('notify_users_default'), @$in['email'], @$errors['email']);
if ($captchareason) {
require_once 'qa-app-captcha.php';
require_once QA_INCLUDE_DIR . 'app/captcha.php';
qa_set_up_captcha_field($qa_content, $qa_content['form']['fields'], @$errors, qa_captcha_reason_note($captchareason));
}
......
qa-include/pages/categories.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/comments.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/confirm.php
......@@ -56,7 +56,7 @@
}
} elseif (strlen($incode)) { // non-empty code detected from the URL
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
if (!empty($inhandle)) { // match based on code and handle provided on URL
......
qa-include/pages/default.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/favorites-list.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/favorites.php';
......
qa-include/pages/favorites.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/favorites.php';
......
qa-include/pages/feedback.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Get useful information on the logged in user
......
qa-include/pages/forgot.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
......
qa-include/pages/hot.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/ip.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......@@ -108,7 +108,7 @@
if (qa_clicked('dohideall') && !qa_user_maximum_permit_error('permit_hide_show')) {
// allow moderator in one category to hide posts across all categories if they are identified via IP page
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postids=qa_db_get_ip_visible_postids($ip);
......
qa-include/pages/login.php
......@@ -52,8 +52,8 @@
require_once QA_INCLUDE_DIR.'app/limits.php';
if (qa_user_limits_remaining(QA_LIMIT_LOGINS)) {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
if (!qa_check_form_security_code('login', qa_post_text('code')))
$pageerror=qa_lang_html('misc/form_security_again');
......
qa-include/pages/message.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
......@@ -117,7 +117,7 @@
$errors['message'] = qa_lang('misc/message_empty');
if (empty($errors)) {
require_once QA_INCLUDE_DIR.'qa-db-messages.php';
require_once QA_INCLUDE_DIR.'db/messages.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
if (qa_opt('show_message_history'))
......
qa-include/pages/messages.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
......
qa-include/pages/question.php
......@@ -31,7 +31,7 @@
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'qa-util-sort.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
......
qa-include/pages/questions.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/register.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
// Check we're not using single-sign on integration, that we're not logged in, and we're not blocked
......
qa-include/pages/reset.php
......@@ -43,7 +43,7 @@
if (qa_clicked('doreset')) {
require_once QA_INCLUDE_DIR.'app/users-edit.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$inemailhandle=qa_post_text('emailhandle');
$incode=trim(qa_post_text('code')); // trim to prevent passing in blank values to match uninitiated DB rows
......@@ -60,7 +60,7 @@
$matchusers=qa_db_user_find_by_handle($inemailhandle);
if (count($matchusers)==1) { // if match more than one (should be impossible), consider it a non-match
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$inuserid=$matchusers[0];
$userinfo=qa_db_select_with_pending(qa_db_user_account_selectspec($inuserid, true));
......
qa-include/pages/tag.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
......
qa-include/pages/tags.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/unanswered.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/unsubscribe.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
// Check we're not using single-sign on integration
......
qa-include/pages/updates.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
......
qa-include/pages/user-activity.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/user-answers.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/user-profile.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
......@@ -154,7 +154,7 @@
elseif (qa_clicked('dosave')) {
require_once QA_INCLUDE_DIR.'app/users-edit.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
$inemail = qa_post_text('email');
......@@ -277,7 +277,7 @@
}
if (qa_clicked('dohideall') && !qa_user_permit_error('permit_hide_show')) {
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postids = qa_db_get_user_visible_postids($userid);
......@@ -325,7 +325,7 @@
// Process bonus setting button
if ( ($loginlevel >= QA_USER_LEVEL_ADMIN) && qa_clicked('dosetbonus') ) {
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'db/points.php';
$inbonus = (int)qa_post_text('bonus');
......
qa-include/pages/user-questions.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/user-wall.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/messages.php';
......
qa-include/pages/users-blocked.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/users-special.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/pages/users.php
......@@ -29,8 +29,8 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
require_once QA_INCLUDE_DIR.'app/format.php';
......
qa-include/qa-feed.php
......@@ -174,7 +174,7 @@
// Retrieve the appropriate questions and other information for this feed
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$sitetitle=qa_opt('site_title');
$siteurl=qa_opt('site_url');
......
qa-include/qa-image.php
......@@ -45,7 +45,7 @@
// Retrieve the scaled image from the cache if available
require_once QA_INCLUDE_DIR.'qa-db-cache.php';
require_once QA_INCLUDE_DIR.'db/cache.php';
qa_db_connect('qa_image_db_fail_handler');
......
qa-include/qa-install.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-db-install.php';
require_once QA_INCLUDE_DIR.'db/install.php';
qa_report_process_stage('init_install');
......@@ -113,7 +113,7 @@
if (QA_FINAL_EXTERNAL_USERS) {
if (defined('QA_FINAL_WORDPRESS_INTEGRATE_PATH')) {
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
require_once QA_INCLUDE_DIR.'app/format.php';
qa_db_page_move(qa_db_page_create(get_option('blogname'), QA_PAGE_FLAGS_EXTERNAL, get_option('home'), null, null, null), 'O', 1);
......@@ -163,7 +163,7 @@
}
if (qa_clicked('super')) {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
$inemail=qa_post_text('email');
......@@ -235,7 +235,7 @@
break;
default:
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
require_once QA_INCLUDE_DIR.'db/admin.php';
if ( (!QA_FINAL_EXTERNAL_USERS) && (qa_db_count_users()==0) ) {
$errorhtml.="There are currently no users in the Question2Answer database.\n\nPlease enter your details below to create the super administrator:";
......
qa-include/qa-layer-voters-flaggers.php
......@@ -54,7 +54,7 @@
private function retrieve_queued_voters_flaggers()
{
if (count($this->qa_voters_flaggers_queue)) {
require_once QA_INCLUDE_DIR.'qa-db-votes.php';
require_once QA_INCLUDE_DIR.'db/votes.php';
$postids=array_keys($this->qa_voters_flaggers_queue);
......
qa-include/qa-page.php
......@@ -33,7 +33,7 @@
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
// Functions which are called at the bottom of this file
......@@ -132,7 +132,7 @@
else {
require_once QA_INCLUDE_DIR.'app/votes.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'db/selects.php';
$userid=qa_get_logged_in_userid();
......@@ -174,11 +174,11 @@
setcookie('qa_noticed', 1, time()+86400*3650, '/', QA_COOKIE_DOMAIN);
elseif ($noticeid=='welcome') {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'db/users.php';
qa_db_user_set_flag(qa_get_logged_in_userid(), QA_USER_FLAGS_WELCOME_NOTICE, false);
} else {
require_once QA_INCLUDE_DIR.'qa-db-notices.php';
require_once QA_INCLUDE_DIR.'db/notices.php';
qa_db_usernotice_delete(qa_get_logged_in_userid(), $noticeid);
}
......@@ -375,7 +375,7 @@
*/
{
if (isset($qa_content['inc_views_postid'])) {
require_once QA_INCLUDE_DIR.'qa-db-hotness.php';
require_once QA_INCLUDE_DIR.'db/hotness.php';
qa_db_hotness_update($qa_content['inc_views_postid'], null, true);
return true;
}
......
qa-plugin/event-logger/qa-event-logger.php
......@@ -33,7 +33,7 @@
if (!in_array($tablename, $table_list)) {
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'db/maxima.php';
return 'CREATE TABLE ^eventlog ('.
'datetime DATETIME NOT NULL,'.
......
qa-plugin/tag-cloud-widget/qa-tag-cloud.php
......@@ -114,7 +114,7 @@
public function output_widget($region, $place, $themeobject, $template, $request, $qa_content)
{
require_once QA_INCLUDE_DIR . 'qa-db-selects.php';
require_once QA_INCLUDE_DIR . 'db/selects.php';
$populartags = qa_db_single_select(qa_db_popular_tags_selectspec(0, (int) qa_opt('tag_cloud_count_tags')));
......
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