Skip to content

Q
question2answer
Commit 7d266f65 by Scott
Options

Update all qa-app-* includes

parent 101497a4
Showing with 299 additions and 299 deletions
qa-include/ajax/answer.php
......@@ -24,8 +24,8 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
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';
......@@ -43,10 +43,10 @@
// Check if the question exists, is not closed, and whether the user has permission to do this
if ((@$question['basetype']=='Q') && (!isset($question['closedbyid'])) && !qa_user_post_permit_error('permit_post_a', $question, QA_LIMIT_ANSWERS)) {
require_once QA_INCLUDE_DIR.'qa-app-captcha.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
......
qa-include/ajax/asktitle.php
......@@ -26,8 +26,8 @@
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Collect the information we need from the database
......
qa-include/ajax/click-admin.php
......@@ -24,9 +24,9 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
$entityid=qa_post_text('entityid');
......
qa-include/ajax/click-answer.php
......@@ -24,9 +24,9 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
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.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
......
qa-include/ajax/click-comment.php
......@@ -24,9 +24,9 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
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.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
......
qa-include/ajax/click-pm.php
......@@ -24,9 +24,9 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-messages.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
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';
......
qa-include/ajax/click-wall.php
......@@ -24,9 +24,9 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-messages.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
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';
......
qa-include/ajax/comment.php
......@@ -24,8 +24,8 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
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';
......@@ -49,10 +49,10 @@
((@$parent['basetype']=='Q') || (@$parent['basetype']=='A')) &&
!qa_user_post_permit_error('permit_post_c', $parent, QA_LIMIT_COMMENTS))
{
require_once QA_INCLUDE_DIR.'qa-app-captcha.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
require_once QA_INCLUDE_DIR.'qa-util-sort.php';
......
qa-include/ajax/favorite.php
......@@ -24,10 +24,10 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-favorites.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
require_once QA_INCLUDE_DIR.'app/favorites.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$entitytype=qa_post_text('entitytype');
......
qa-include/ajax/mailing.php
......@@ -24,8 +24,8 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-mailing.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/mailing.php';
$continue=false;
......
qa-include/ajax/notice.php
......@@ -24,7 +24,7 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
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';
......
qa-include/ajax/recalc.php
......@@ -24,8 +24,8 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-recalc.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/recalc.php';
if (qa_get_logged_in_level()>=QA_USER_LEVEL_ADMIN) {
......
qa-include/ajax/show-comments.php
......@@ -25,9 +25,9 @@
*/
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-format.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';
require_once QA_INCLUDE_DIR.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'qa-util-sort.php';
......
qa-include/ajax/version.php
......@@ -24,7 +24,7 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
$uri = qa_post_text('uri');
......
qa-include/ajax/vote.php
......@@ -24,11 +24,11 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
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';
......
qa-include/ajax/wallpost.php
......@@ -24,9 +24,9 @@
More about this license: http://www.question2answer.org/license.php
*/
require_once QA_INCLUDE_DIR.'qa-app-messages.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
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';
......
qa-include/app/admin.php
......@@ -37,7 +37,7 @@
*/
{
if (!qa_is_logged_in()) {
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$qa_content=qa_content_prepare();
......@@ -229,7 +229,7 @@
ranging from $widest to $narrowest. Set $doconfirms to whether email confirmations are on
*/
{
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
$options=array(
QA_PERMIT_ALL => qa_lang_html('options/permit_all'),
......@@ -490,21 +490,21 @@
switch ($action) {
case 'userapprove':
if ($useraccount['level']<=QA_USER_LEVEL_APPROVED) { // don't demote higher level users
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_set_user_level($useraccount['userid'], $useraccount['handle'], QA_USER_LEVEL_APPROVED, $useraccount['level']);
return true;
}
break;
case 'userblock':
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_set_user_blocked($useraccount['userid'], $useraccount['handle'], true);
return true;
break;
}
} else { // something to do with a post
require_once QA_INCLUDE_DIR.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$post=qa_post_get_full($entityid);
......@@ -548,7 +548,7 @@
break;
case 'clearflags':
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
if (!qa_user_post_permit_error('permit_hide_show', $post)) {
qa_flags_clear_all($post, $userid, qa_get_logged_in_handle(), null);
......
qa-include/app/emails.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
function qa_suspend_notifications($suspend=true)
......
qa-include/app/events.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-events.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
function qa_create_event_for_q_user($questionid, $lastpostid, $updatetype, $lastuserid, $otheruserid=null, $timestamp=null)
......@@ -78,7 +78,7 @@
{
if (isset($categoryid)) {
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.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);
foreach ($categories as $category)
......
qa-include/app/favorites.php
......@@ -43,8 +43,8 @@
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.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
// Make sure the user is not favoriting themselves
if ($entitytype == QA_ENTITY_USER && $userid == $entityid) {
......@@ -126,7 +126,7 @@
if (QA_FINAL_EXTERNAL_USERS)
return null;
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
$ranking = array(
'items' => array(),
......
qa-include/app/format.php
......@@ -94,7 +94,7 @@
['handle'] and/or ['lasthandle'] are required in each element.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
if (QA_FINAL_EXTERNAL_USERS) {
$keyuserids=array();
......@@ -256,7 +256,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
if (isset($options['blockwordspreg']))
require_once QA_INCLUDE_DIR.'qa-util-string.php';
......@@ -615,7 +615,7 @@
Pass viewing options in $options (see qa_message_html_defaults() in qa-app-options.php)
*/
{
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
......@@ -732,7 +732,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$fields=qa_post_html_fields($question, $userid, $cookieid, $usershtml, null, $options);
......@@ -1071,7 +1071,7 @@
Return $htmlmessage with ^1...^6 substituted for links to log in or register or confirm email and come back to $topage with $params
*/
{
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
$userlinks=qa_get_login_links(qa_path_to_root(), isset($topage) ? qa_path($topage, $params, '') : null);
......
qa-include/app/mailing.php
......@@ -114,7 +114,7 @@
Pass the user's existing $emailcode if there is one, otherwise a new one will be set up
*/
{
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
if (!strlen(trim($emailcode))) {
......
qa-include/app/messages.php
......@@ -36,7 +36,7 @@
user flags $touserflags. If there is no such reason the function returns false.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
......@@ -81,7 +81,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'qa-db-messages.php';
$messageid = qa_db_message_create($userid, $touserid, $content, $format, true);
......@@ -152,7 +152,7 @@
qa_db_recent_messages_selectspec() and then qa_wall_posts_add_rules()).
*/
{
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$options = qa_message_html_defaults();
......
qa-include/app/options.php
......@@ -416,7 +416,7 @@
case 'editor_for_qs':
case 'editor_for_as':
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$value='-'; // to match none by default, i.e. choose based on who is best at editing HTML
qa_load_editor('', 'html', $value);
......@@ -532,7 +532,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
return array(
'tagsview' => ($basetype=='Q') && qa_using_tags(),
......
qa-include/app/post-create.php
......@@ -221,9 +221,9 @@
See qa-app-posts.php for a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
if (!isset($parent))
......
qa-include/app/post-update.php
......@@ -29,8 +29,8 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
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';
......@@ -70,7 +70,7 @@
}
if ($setupdated && $remoderate) {
require_once QA_INCLUDE_DIR.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$answers = qa_post_get_question_answers($oldquestion['postid']);
$commentsfollows = qa_post_get_question_commentsfollows($oldquestion['postid']);
......@@ -257,8 +257,8 @@
reports. See qa-app-posts.php for a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$washidden=($oldquestion['type']=='Q_HIDDEN');
$wasqueued=($oldquestion['type']=='Q_QUEUED');
......@@ -533,7 +533,7 @@
$setupdated ? $userid : null, $setupdated ? qa_remote_ip_address() : null, QA_UPDATE_CONTENT, $name);
if ($setupdated && $remoderate) {
require_once QA_INCLUDE_DIR.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$commentsfollows=qa_post_get_answer_commentsfollows($oldanswer['postid']);
......@@ -595,7 +595,7 @@
a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$washidden=($oldanswer['type']=='A_HIDDEN');
$wasqueued=($oldanswer['type']=='A_QUEUED');
......@@ -921,7 +921,7 @@
points, cached counts and event reports. See qa-app-posts.php for a higher-level function which is easier to use.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
if (!isset($parent))
$parent=$question; // for backwards compatibility with old answer parameter
......
qa-include/app/posts.php
......@@ -31,10 +31,10 @@
require_once QA_INCLUDE_DIR.'qa-db.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'qa-app-post-update.php';
require_once QA_INCLUDE_DIR.'qa-app-users.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';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
......
qa-include/app/q-list.php
......@@ -49,8 +49,8 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$userid=qa_get_logged_in_userid();
......
qa-include/app/recalc.php
......@@ -71,9 +71,9 @@
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.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'qa-app-post-update.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';
function qa_recalc_perform_step(&$state)
......@@ -95,7 +95,7 @@
$pages=qa_db_pages_get_for_reindexing($next, 10);
if (count($pages)) {
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$lastpageid=max(array_keys($pages));
......@@ -134,7 +134,7 @@
$posts=qa_db_posts_get_for_reindexing($next, 10);
if (count($posts)) {
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$lastpostid=max(array_keys($posts));
......@@ -271,8 +271,8 @@
$questionids=qa_db_qs_get_for_event_refilling($next, 1);
if (count($questionids)) {
require_once QA_INCLUDE_DIR.'qa-app-events.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/events.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
require_once QA_INCLUDE_DIR.'qa-util-sort.php';
$lastquestionid=max($questionids);
......@@ -428,7 +428,7 @@
$posts=qa_db_posts_get_for_deleting('C', $next, 1);
if (count($posts)) {
require_once QA_INCLUDE_DIR.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postid=$posts[0];
......@@ -446,7 +446,7 @@
$posts=qa_db_posts_get_for_deleting('A', $next, 1);
if (count($posts)) {
require_once QA_INCLUDE_DIR.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postid=$posts[0];
......@@ -464,7 +464,7 @@
$posts=qa_db_posts_get_for_deleting('Q', $next, 1);
if (count($posts)) {
require_once QA_INCLUDE_DIR.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postid=$posts[0];
......@@ -486,7 +486,7 @@
$blob=qa_db_get_next_blob_in_db($next);
if (isset($blob)) {
require_once QA_INCLUDE_DIR.'qa-app-blobs.php';
require_once QA_INCLUDE_DIR.'app/blobs.php';
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
if (qa_write_blob_file($blob['blobid'], $blob['content'], $blob['format']))
......@@ -508,7 +508,7 @@
$blob=qa_db_get_next_blob_on_disk($next);
if (isset($blob)) {
require_once QA_INCLUDE_DIR.'qa-app-blobs.php';
require_once QA_INCLUDE_DIR.'app/blobs.php';
require_once QA_INCLUDE_DIR.'qa-db-blobs.php';
$content=qa_read_blob_file($blob['blobid'], $blob['format']);
......
qa-include/app/upload.php
......@@ -77,8 +77,8 @@
// Check per-user upload limits
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
switch (qa_user_permit_error(null, QA_LIMIT_UPLOADS))
{
......@@ -183,7 +183,7 @@
// Create the blob and return
require_once QA_INCLUDE_DIR.'qa-app-blobs.php';
require_once QA_INCLUDE_DIR.'app/blobs.php';
$userid=qa_get_logged_in_userid();
$cookieid=isset($userid) ? qa_cookie_get() : qa_cookie_get_create();
......
qa-include/app/users-edit.php
......@@ -160,9 +160,9 @@
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.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';
$userid=qa_db_user_create($email, $password, $handle, $level, qa_remote_ip_address());
qa_db_points_update_ifuser($userid, null);
......@@ -246,7 +246,7 @@
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
$userinfo=qa_db_select_with_pending(qa_db_user_account_selectspec($userid, true));
......@@ -281,7 +281,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.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
qa_db_user_set_flag($userid, QA_USER_FLAGS_EMAIL_CONFIRMED, true);
qa_db_user_set_flag($userid, QA_USER_FLAGS_MUST_CONFIRM, false);
......@@ -342,8 +342,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-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-emails.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';
qa_db_user_set($userid, 'emailcode', qa_db_user_rand_emailcode());
......@@ -366,9 +366,9 @@
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.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';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
$password=qa_random_alphanum(max(QA_MIN_PASSWORD_LEN, QA_NEW_PASSWORD_LEN));
......@@ -413,7 +413,7 @@
$imagedata=qa_image_constrain_data($imagedata, $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', null, $userid, null, qa_remote_ip_address());
......
qa-include/app/users.php
......@@ -238,7 +238,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
qa_start_session();
......@@ -300,7 +300,7 @@
qa_set_logged_in_user($users[0]['userid'], $users[0]['handle'], false, $source);
else { // create and log in user
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_db_user_login_sync(true);
......@@ -478,7 +478,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
if (qa_opt('avatar_allow_gravatar') && ($flags & QA_USER_FLAGS_SHOW_GRAVATAR))
$html=qa_get_gravatar_html($email, $size);
......@@ -713,7 +713,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$level=qa_get_logged_in_level();
......@@ -805,7 +805,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
$userid=qa_get_logged_in_userid();
if (!isset($userlevel))
......
qa-include/app/votes.php
......@@ -41,8 +41,8 @@
// The 'login', 'confirm', 'limit', 'userblock' and 'ipblock' permission errors are reported to the user here.
// Others ('approve', 'level') prevent the buttons being clickable in the first place, in qa_get_vote_view(...)
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
if (
is_array($post) &&
......@@ -94,7 +94,7 @@
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.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
$vote=(int)min(1, max(-1, $vote));
$oldvote=(int)qa_db_uservote_get($post['postid'], $userid);
......@@ -152,9 +152,9 @@
// 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.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.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';
if (
is_array($post) &&
......@@ -198,7 +198,7 @@
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-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
qa_db_userflag_set($oldpost['postid'], $userid, true);
......@@ -242,7 +242,7 @@
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-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
qa_db_userflag_set($oldpost['postid'], $userid, false);
......@@ -279,7 +279,7 @@
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-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'qa-db-post-update.php';
qa_db_userflags_clear_all($oldpost['postid']);
......
qa-include/modules/qa-event-limits.php
......@@ -40,7 +40,7 @@
if (isset($params['delayed']))
return;
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
switch ($event) {
case 'q_queue':
......@@ -99,12 +99,12 @@
is_numeric(array_search($event, $writeactions))
) {
if (isset($userid)) {
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
qa_user_report_action($userid, $event);
} elseif (isset($cookieid)) {
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
qa_cookie_report_action($cookieid, $event);
}
......
qa-include/modules/qa-event-notify.php
......@@ -34,8 +34,8 @@
public function process_event($event, $userid, $handle, $cookieid, $params)
{
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
......
qa-include/modules/qa-event-updates.php
......@@ -38,7 +38,7 @@
return;
require_once QA_INCLUDE_DIR.'qa-db-events.php';
require_once QA_INCLUDE_DIR.'qa-app-events.php';
require_once QA_INCLUDE_DIR.'app/events.php';
switch ($event) {
case 'q_post':
......
qa-include/modules/qa-viewer-basic.php
......@@ -131,7 +131,7 @@
$html=qa_html($content, true);
if (@$options['showurllinks']) {
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$html=qa_html_convert_urls($html, qa_opt('links_in_new_window'));
}
......
qa-include/pages/account.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-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.'qa-util-image.php';
......
qa-include/pages/activity.php
......@@ -31,8 +31,8 @@
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
$categoryslugs=qa_request_parts(1);
$countslugs=count($categoryslugs);
......
qa-include/pages/admin/admin-approve.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
......
qa-include/pages/admin/admin-categories.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
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';
......
qa-include/pages/admin/admin-default.php
......@@ -32,8 +32,8 @@
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.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
$adminsection = strtolower(qa_request_part(1));
......@@ -623,7 +623,7 @@
break;
case 'mailing':
require_once QA_INCLUDE_DIR.'qa-app-mailing.php';
require_once QA_INCLUDE_DIR.'app/mailing.php';
$subtitle = 'admin/mailing_title';
......
qa-include/pages/admin/admin-flagged.php
......@@ -29,9 +29,9 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Find most flagged questions, answers, comments
......
qa-include/pages/admin/admin-hidden.php
......@@ -29,10 +29,10 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
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.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Find recently hidden questions, answers, comments
......
qa-include/pages/admin/admin-moderate.php
......@@ -29,9 +29,9 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Find queued questions, answers, comments
......
qa-include/pages/admin/admin-pages.php
......@@ -29,8 +29,8 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
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';
......
qa-include/pages/admin/admin-plugins.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
// Check admin privileges
......
qa-include/pages/admin/admin-points.php
......@@ -31,8 +31,8 @@
require_once QA_INCLUDE_DIR.'qa-db-recalc.php';
require_once QA_INCLUDE_DIR.'qa-db-points.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-admin.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-recalc.php
......@@ -29,8 +29,8 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'qa-app-recalc.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'app/recalc.php';
// Check we have administrative privileges
......@@ -125,7 +125,7 @@
return $qa_content;
} else {
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$qa_content=qa_content_prepare();
......
qa-include/pages/admin/admin-stats.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-recalc.php';
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-admin.php';
......
qa-include/pages/admin/admin-userfields.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
......
qa-include/pages/admin/admin-usertitles.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
......
qa-include/pages/admin/admin-widgets.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
......
qa-include/pages/answers.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
$categoryslugs=qa_request_parts(1);
......
qa-include/pages/ask.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
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.'qa-util-sort.php';
......@@ -103,7 +103,7 @@
$in['tags']=qa_get_tags_field_value('tags');
if (qa_clicked('doask')) {
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
$categoryids=array_keys(qa_category_path($categories, @$in['categoryid']));
......
qa-include/pages/categories.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$categoryslugs=qa_request_parts(1);
......
qa-include/pages/comments.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
$categoryslugs=qa_request_parts(1);
$countslugs=count($categoryslugs);
......
qa-include/pages/confirm.php
......@@ -45,7 +45,7 @@
$userconfirmed=false;
if (isset($loginuserid) && qa_clicked('dosendconfirm')) { // button clicked to send a link
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
if (!qa_check_form_security_code('confirm', qa_post_text('code')))
$pageerror=qa_lang_html('misc/form_security_again');
......@@ -57,7 +57,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.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
if (!empty($inhandle)) { // match based on code and handle provided on URL
$userinfo=qa_db_select_with_pending(qa_db_user_account_selectspec($inhandle, false));
......
qa-include/pages/default.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Determine whether path begins with qa or not (question and answer listing can be accessed either way)
......@@ -125,7 +125,7 @@
// If we got this far, it's a good old-fashioned Q&A listing page
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
qa_set_template('qa');
$questions=qa_any_sort_and_dedupe(array_merge($questions1, $questions2));
......
qa-include/pages/favorites-list.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-favorites.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/favorites.php';
// Data for functions to run
......
qa-include/pages/favorites.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-favorites.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/favorites.php';
// Check that we're logged in
......
qa-include/pages/feedback.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-captcha.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
......@@ -63,7 +63,7 @@
$feedbacksent=false;
if (qa_clicked('dofeedback')) {
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
$inmessage=qa_post_text('message');
......
qa-include/pages/forgot.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-app-captcha.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
// Check we're not using single-sign on integration and that we're not logged in
......@@ -45,7 +45,7 @@
// Start the 'I forgot my password' process, sending email if appropriate
if (qa_clicked('doforgot')) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
$inemailhandle=qa_post_text('emailhandle');
......
qa-include/pages/hot.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
// Get list of hottest questions, allow per-category if QA_ALLOW_UNINDEXED_QUERIES set in qa-config.php
......
qa-include/pages/ip.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
$ip=qa_request_part(1); // picked up from qa-page.php
......@@ -88,7 +88,7 @@
}
if (qa_clicked('dounblock')) {
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
$blockipclauses=qa_block_ips_explode(qa_opt('block_ips_write'));
......@@ -109,7 +109,7 @@
// 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.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postids=qa_db_get_ip_visible_postids($ip);
......@@ -158,7 +158,7 @@
if ($blockable) {
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
$blockipclauses=qa_block_ips_explode(qa_opt('block_ips_write'));
$matchclauses=array();
......
qa-include/pages/login.php
......@@ -49,7 +49,7 @@
$inremember=qa_post_text('remember');
if (qa_clicked('dologin') && (strlen($inemailhandle) || strlen($inpassword)) ) {
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
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';
......@@ -73,7 +73,7 @@
$userinfo=qa_db_select_with_pending(qa_db_user_account_selectspec($inuserid, true));
if (strtolower(qa_db_calc_passcheck($inpassword, $userinfo['passsalt'])) == strtolower($userinfo['passcheck'])) { // login and redirect
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
qa_set_logged_in_user($inuserid, $userinfo['handle'], !empty($inremember));
......
qa-include/pages/message.php
......@@ -30,9 +30,9 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.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';
$handle = qa_request_part(1);
$loginuserid = qa_get_logged_in_userid();
......@@ -118,7 +118,7 @@
if (empty($errors)) {
require_once QA_INCLUDE_DIR.'qa-db-messages.php';
require_once QA_INCLUDE_DIR.'qa-app-emails.php';
require_once QA_INCLUDE_DIR.'app/emails.php';
if (qa_opt('show_message_history'))
$messageid = qa_db_message_create($loginuserid, $toaccount['userid'], $inmessage, '', false);
......
qa-include/pages/messages.php
......@@ -30,9 +30,9 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.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';
$loginUserId = qa_get_logged_in_userid();
$loginUserHandle = qa_get_logged_in_handle();
......
qa-include/pages/question-post.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
require_once QA_INCLUDE_DIR.'pages/question-submit.php';
......
qa-include/pages/question-submit.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-app-post-create.php';
require_once QA_INCLUDE_DIR.'qa-app-post-update.php';
require_once QA_INCLUDE_DIR.'app/post-create.php';
require_once QA_INCLUDE_DIR.'app/post-update.php';
function qa_page_q_single_click_q($question, $answers, $commentsfollows, $closepost, &$error)
......@@ -41,8 +41,8 @@
none). If there is an error to display, it will be passed out in $error.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-post-update.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/post-update.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
$userid=qa_get_logged_in_userid();
$handle=qa_get_logged_in_handle();
......@@ -91,7 +91,7 @@
}
if (qa_clicked('q_doflag') && $question['flagbutton'] && qa_page_q_click_check_form_code($question, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
$error=qa_flag_error_html($question, $userid, qa_request());
if (!$error) {
......@@ -102,14 +102,14 @@
}
if (qa_clicked('q_dounflag') && $question['unflaggable'] && qa_page_q_click_check_form_code($question, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
qa_flag_clear($question, $userid, $handle, $cookieid);
return true;
}
if (qa_clicked('q_doclearflags') && $question['clearflaggable'] && qa_page_q_click_check_form_code($question, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
qa_flags_clear_all($question, $userid, $handle, $cookieid);
return true;
......@@ -186,7 +186,7 @@
}
if (qa_clicked($prefix.'doflag') && $answer['flagbutton'] && qa_page_q_click_check_form_code($answer, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
$error=qa_flag_error_html($answer, $userid, qa_request());
if (!$error) {
......@@ -198,14 +198,14 @@
}
if (qa_clicked($prefix.'dounflag') && $answer['unflaggable'] && qa_page_q_click_check_form_code($answer, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
qa_flag_clear($answer, $userid, $handle, $cookieid);
return true;
}
if (qa_clicked($prefix.'doclearflags') && $answer['clearflaggable'] && qa_page_q_click_check_form_code($answer, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
qa_flags_clear_all($answer, $userid, $handle, $cookieid);
return true;
......@@ -271,7 +271,7 @@
}
if (qa_clicked($prefix.'doflag') && $comment['flagbutton'] && qa_page_q_click_check_form_code($parent, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
$error=qa_flag_error_html($comment, $userid, qa_request());
if (!$error) {
......@@ -283,14 +283,14 @@
}
if (qa_clicked($prefix.'dounflag') && $comment['unflaggable'] && qa_page_q_click_check_form_code($parent, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
qa_flag_clear($comment, $userid, $handle, $cookieid);
return true;
}
if (qa_clicked($prefix.'doclearflags') && $comment['clearflaggable'] && qa_page_q_click_check_form_code($parent, $error)) {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
qa_flags_clear_all($comment, $userid, $handle, $cookieid);
return true;
......
qa-include/pages/question.php
......@@ -29,14 +29,14 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
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.'qa-util-sort.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
require_once QA_INCLUDE_DIR.'qa-app-captcha.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'pages/question-view.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$questionid=qa_request_part(0);
$userid=qa_get_logged_in_userid();
......
qa-include/pages/questions.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
$categoryslugs=qa_request_parts(1);
$countslugs=count($categoryslugs);
......
qa-include/pages/register.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-captcha.php';
require_once QA_INCLUDE_DIR.'app/captcha.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
......@@ -74,10 +74,10 @@
// Process submitted form
if (qa_clicked('doregister')) {
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'app/limits.php';
if (qa_user_limits_remaining(QA_LIMIT_REGISTRATIONS)) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
$inemail = qa_post_text('email');
$inpassword = qa_post_text('password');
......
qa-include/pages/reset.php
......@@ -42,7 +42,7 @@
// Process incoming form
if (qa_clicked('doreset')) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
$inemailhandle=qa_post_text('emailhandle');
......
qa-include/pages/search.php
......@@ -29,9 +29,9 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-search.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/search.php';
// Perform the search if appropriate
......
qa-include/pages/tag.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$tag=qa_request_part(1); // picked up from qa-page.php
$start=qa_get_start();
......
qa-include/pages/tags.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Get popular tags
......
qa-include/pages/unanswered.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
// Get list of unanswered questions, allow per-category if QA_ALLOW_UNINDEXED_QUERIES set in qa-config.php
......
qa-include/pages/updates.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-q-list.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/q-list.php';
// Check that we're logged in
......
qa-include/pages/user-activity.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// $handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
......
qa-include/pages/user-answers.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// $handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
......
qa-include/pages/user-profile.php
......@@ -30,9 +30,9 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-limits.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.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';
// $handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
......@@ -76,7 +76,7 @@
$loginlevel = qa_get_logged_in_level();
if (!QA_FINAL_EXTERNAL_USERS) { // if we're using integrated user management, we can know and show more
require_once QA_INCLUDE_DIR.'qa-app-messages.php';
require_once QA_INCLUDE_DIR.'app/messages.php';
if ((!is_array($userpoints)) && !is_array($useraccount))
return include QA_INCLUDE_DIR.'qa-page-not-found.php';
......@@ -153,7 +153,7 @@
qa_redirect(qa_request(), array('state' => 'edit'));
elseif (qa_clicked('dosave')) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
require_once QA_INCLUDE_DIR.'qa-db-users.php';
$inemail = qa_post_text('email');
......@@ -172,7 +172,7 @@
qa_db_user_set_flag($userid, QA_USER_FLAGS_SHOW_GRAVATAR, false);
if (isset($useraccount['avatarblobid'])) {
require_once QA_INCLUDE_DIR.'qa-app-blobs.php';
require_once QA_INCLUDE_DIR.'app/blobs.php';
qa_db_user_set($userid, 'avatarblobid', null);
qa_db_user_set($userid, 'avatarwidth', null);
......@@ -256,21 +256,21 @@
else {
if ($approvebutton && qa_clicked('doapprove')) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_set_user_level($userid, $useraccount['handle'], QA_USER_LEVEL_APPROVED, $useraccount['level']);
qa_redirect(qa_request());
}
if (isset($maxlevelassign) && ($maxuserlevel < QA_USER_LEVEL_MODERATOR)) {
if (qa_clicked('doblock')) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_set_user_blocked($userid, $useraccount['handle'], true);
qa_redirect(qa_request());
}
if (qa_clicked('dounblock')) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_set_user_blocked($userid, $useraccount['handle'], false);
qa_redirect(qa_request());
......@@ -278,7 +278,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.'qa-app-posts.php';
require_once QA_INCLUDE_DIR.'app/posts.php';
$postids = qa_db_get_user_visible_postids($userid);
......@@ -289,7 +289,7 @@
}
if (qa_clicked('dodelete') && ($loginlevel >= QA_USER_LEVEL_ADMIN)) {
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
qa_delete_user($userid);
......
qa-include/pages/user-questions.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// $handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
......
qa-include/pages/user-wall.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-messages.php';
require_once QA_INCLUDE_DIR.'app/messages.php';
// Check we're not using single-sign on integration, which doesn't allow walls
......
qa-include/pages/users-blocked.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Check we're not using single-sign on integration
......
qa-include/pages/users-special.php
......@@ -30,8 +30,8 @@
}
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Check we're not using single-sign on integration
......
qa-include/pages/users.php
......@@ -31,7 +31,7 @@
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
// Get list of all users
......
qa-include/qa-base.php
......@@ -1271,7 +1271,7 @@
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
if (!isset($neaturls)) {
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
$neaturls=qa_opt('neat_urls');
}
......@@ -1356,7 +1356,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
$title=qa_block_words_replace($title, qa_get_block_words_preg());
......@@ -1533,7 +1533,7 @@
if ((!isset($value)) && isset($qa_options_cache[$name]))
return $qa_options_cache[$name]; // quick shortcut to reduce calls to qa_get_options()
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
if (isset($value))
qa_set_option($name, $value);
......
qa-include/qa-blob.php
......@@ -45,7 +45,7 @@
// Output the blob in question
require_once QA_INCLUDE_DIR.'qa-app-blobs.php';
require_once QA_INCLUDE_DIR.'app/blobs.php';
qa_db_connect('qa_blob_db_fail_handler');
......
qa-include/qa-check-lang.php
......@@ -27,7 +27,7 @@
define('QA_BASE_DIR', dirname(dirname(empty($_SERVER['SCRIPT_FILENAME']) ? __FILE__ : $_SERVER['SCRIPT_FILENAME'])).'/');
require 'qa-base.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
if (qa_get_logged_in_level() < QA_USER_LEVEL_ADMIN)
qa_redirect('admin/general', null, qa_opt('site_url'));
......@@ -129,7 +129,7 @@
foreach ($where as $onewhere)
output_lang_issue($onewhere['prefix'], $onewhere['key'], 'contains the shared phrase "'.$phrase.'"', false);
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
$languages=qa_admin_language_options();
unset($languages['']);
......
qa-include/qa-db-events.php
......@@ -40,7 +40,7 @@
*/
{
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$updatedsql=isset($timestamp) ? ('FROM_UNIXTIME('.qa_db_argument_to_mysql($timestamp, false).')') : 'NOW()';
......@@ -120,7 +120,7 @@
$timestamp for the event time or leave as null to use now. Also handles truncation of event streams.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$updatedsql=isset($timestamp) ? ('FROM_UNIXTIME('.qa_db_argument_to_mysql($timestamp, false).')') : 'NOW()';
......
qa-include/qa-db-install.php
......@@ -70,7 +70,7 @@
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
/*
Important note on character encoding in database and PHP connection to MySQL
......@@ -727,7 +727,7 @@
Upgrade the database schema to the latest version, outputting progress to the browser
*/
{
require_once QA_INCLUDE_DIR.'qa-app-recalc.php';
require_once QA_INCLUDE_DIR.'app/recalc.php';
$definitions=qa_db_table_definitions();
$keyrecalc=array();
......
qa-include/qa-db-points.php
......@@ -58,7 +58,7 @@
{
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
$options=qa_get_options(qa_db_points_option_names());
......@@ -149,8 +149,8 @@
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
if (qa_should_update_counts() && isset($userid)) {
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/cookies.php';
$calculations=qa_db_points_calculations();
......
qa-include/qa-db-post-update.php
......@@ -30,7 +30,7 @@
}
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
function qa_db_post_set_selchildid($questionid, $selchildid, $lastuserid=null, $lastip=null)
......
qa-include/qa-db-selects.php
......@@ -39,7 +39,7 @@
result, otherwise return an array of results indexed as per the parameters.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
global $qa_db_pending_selectspecs, $qa_db_pending_results;
......@@ -153,7 +153,7 @@
);
if (isset($voteuserid)) {
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$selectspec['columns']['uservote']='^uservotes.vote';
$selectspec['columns']['userflag']='^uservotes.flag';
......@@ -776,7 +776,7 @@
if (!empty($handlewords)) {
if (QA_FINAL_EXTERNAL_USERS) {
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
$userids=qa_get_userids_from_public($handlewords);
......@@ -1444,7 +1444,7 @@
The $identifier should be a handle, word, backpath or postid for users, tags, categories and questions respectively.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$selectspec=array(
'columns' => array('flags' => 'COUNT(*)'),
......@@ -1484,7 +1484,7 @@
Returns $limit questions, or all of them if $limit is null (used in qa_db_selectspec_count).
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$selectspec = qa_db_posts_basic_selectspec($userid);
......@@ -1511,7 +1511,7 @@
Returns $limit users, or all of them if $limit is null (used in qa_db_selectspec_count).
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$source = '^users JOIN ^userpoints ON ^users.userid=^userpoints.userid JOIN ^userfavorites ON ^users.userid=^userfavorites.entityid WHERE ^userfavorites.userid=$ AND ^userfavorites.entitytype=$ ORDER BY ^users.handle';
$arguments = array($userid, QA_ENTITY_USER);
......@@ -1538,7 +1538,7 @@
Returns $limit tags, or all of them if $limit is null (used in qa_db_selectspec_count).
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$source = '^words JOIN ^userfavorites ON ^words.wordid=^userfavorites.entityid WHERE ^userfavorites.userid=$ AND ^userfavorites.entitytype=$ ORDER BY ^words.tagcount DESC';
$arguments = array($userid, QA_ENTITY_TAG);
......@@ -1564,7 +1564,7 @@
Return the selectspec to retrieve an array of $userid's favorited categories, with information about those categories.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
return array(
'columns' => array('categoryid', 'title', 'tags', 'qcount', 'backpath', 'content'),
......@@ -1581,7 +1581,7 @@
the type of item, the array for each item will contain a userid, category backpath or tag word.
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
return array(
'columns' => array('type' => 'entitytype', 'userid' => 'IF (entitytype=$, entityid, NULL)', 'categorybackpath' => '^categories.backpath', 'tags' => '^words.word'),
......@@ -1599,7 +1599,7 @@
favorited and which no longer post to user streams (see long comment in qa-db-favorites.php).
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$selectspec=qa_db_posts_basic_selectspec($userid);
......@@ -1680,7 +1680,7 @@
information about these contexts (currently, categories).
*/
{
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
$selectspec=array(
'columns' => array('entityid', 'entitytype', 'level'),
......
qa-include/qa-external-users-wp.php
......@@ -149,7 +149,7 @@
function qa_avatar_html_from_userid($userid, $size, $padding)
{
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
global $qa_cache_wp_user_emails;
......
qa-include/qa-feed.php
......@@ -33,7 +33,7 @@
qa_report_process_stage('init_feed');
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'app/options.php';
// Functions used within this file
......@@ -244,7 +244,7 @@
break;
case 'search':
require_once QA_INCLUDE_DIR.'qa-app-search.php';
require_once QA_INCLUDE_DIR.'app/search.php';
$query=$feedparams[0];
......@@ -273,8 +273,8 @@
// Remove duplicate questions (perhaps referenced in an answer and a comment) and cut down to size
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-updates.php';
require_once QA_INCLUDE_DIR.'app/format.php';
require_once QA_INCLUDE_DIR.'app/updates.php';
require_once QA_INCLUDE_DIR.'qa-util-string.php';
if ( ($feedtype!='search') && ($feedtype!='hot') ) // leave search results and hot questions sorted by relevance
......
qa-include/qa-image.php
......@@ -62,8 +62,8 @@
echo $content;
} else {
require_once QA_INCLUDE_DIR.'qa-app-options.php';
require_once QA_INCLUDE_DIR.'qa-app-blobs.php';
require_once QA_INCLUDE_DIR.'app/options.php';
require_once QA_INCLUDE_DIR.'app/blobs.php';
require_once QA_INCLUDE_DIR.'qa-util-image.php';
......
qa-include/qa-install.php
......@@ -114,7 +114,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.'qa-app-format.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);
// create link back to WordPress home page
......@@ -164,7 +164,7 @@
if (qa_clicked('super')) {
require_once QA_INCLUDE_DIR.'qa-db-users.php';
require_once QA_INCLUDE_DIR.'qa-app-users-edit.php';
require_once QA_INCLUDE_DIR.'app/users-edit.php';
$inemail=qa_post_text('email');
$inpassword=qa_post_text('password');
......@@ -176,7 +176,7 @@
);
if (empty($fielderrors)) {
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
$userid=qa_create_new_user($inemail, $inpassword, $inhandle, QA_USER_LEVEL_SUPER);
qa_set_logged_in_user($userid, $inhandle);
......
qa-include/qa-page-not-found.php
......@@ -29,7 +29,7 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'app/format.php';
header('HTTP/1.0 404 Not Found');
......
qa-include/qa-page.php
......@@ -29,10 +29,10 @@
exit;
}
require_once QA_INCLUDE_DIR.'qa-app-cookies.php';
require_once QA_INCLUDE_DIR.'qa-app-format.php';
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'qa-app-options.php';
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.'app/options.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
......@@ -131,7 +131,7 @@
$qa_page_error_html=qa_lang_html('misc/form_security_again');
else {
require_once QA_INCLUDE_DIR.'qa-app-votes.php';
require_once QA_INCLUDE_DIR.'app/votes.php';
require_once QA_INCLUDE_DIR.'qa-db-selects.php';
$userid=qa_get_logged_in_userid();
......@@ -155,7 +155,7 @@
$qa_page_error_html=qa_lang_html('misc/form_security_again');
else {
require_once QA_INCLUDE_DIR.'qa-app-favorites.php';
require_once QA_INCLUDE_DIR.'app/favorites.php';
qa_user_favorite_set(qa_get_logged_in_userid(), qa_get_logged_in_handle(), qa_cookie_get(), $entitytype, $entityid, $favorite);
qa_redirect(qa_request(), $_GET);
......
qa-include/qa-url-test.php
......@@ -25,7 +25,7 @@
*/
if (qa_gpc_to_string(@$_GET['param'])==QA_URL_TEST_STRING) {
require_once QA_INCLUDE_DIR.'qa-app-admin.php';
require_once QA_INCLUDE_DIR.'app/admin.php';
echo '<html><body style="margin:0; padding:0;">';
echo '<table width="100%" height="100%" cellspacing="0" cellpadding="0">';
......
qa-plugin/event-logger/qa-event-logger.php
......@@ -32,7 +32,7 @@
$tablename=qa_db_add_table_prefix('eventlog');
if (!in_array($tablename, $table_list)) {
require_once QA_INCLUDE_DIR.'qa-app-users.php';
require_once QA_INCLUDE_DIR.'app/users.php';
require_once QA_INCLUDE_DIR.'qa-db-maxima.php';
return 'CREATE TABLE ^eventlog ('.
......
qa-plugin/wysiwyg-editor/qa-wysiwyg-editor.php
......@@ -37,7 +37,7 @@ class qa_wysiwyg_editor
public function option_default($option)
{
if ($option == 'wysiwyg_editor_upload_max_size') {
require_once QA_INCLUDE_DIR.'qa-app-upload.php';
require_once QA_INCLUDE_DIR.'app/upload.php';
return min(qa_get_max_upload_size(), 1048576);
}
......@@ -45,7 +45,7 @@ class qa_wysiwyg_editor
public function admin_form(&$qa_content)
{
require_once QA_INCLUDE_DIR.'qa-app-upload.php';
require_once QA_INCLUDE_DIR.'app/upload.php';
$saved = false;
......
qa-plugin/wysiwyg-editor/qa-wysiwyg-upload.php
......@@ -41,7 +41,7 @@ class qa_wysiwyg_upload
if (!qa_opt('wysiwyg_editor_upload_images'))
$message = qa_lang('users/no_permission');
require_once QA_INCLUDE_DIR.'qa-app-upload.php';
require_once QA_INCLUDE_DIR.'app/upload.php';
$upload = qa_upload_file_one(
qa_opt('wysiwyg_editor_upload_max_size'),
......
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