From 595351ce0a3f7a55f4058efb77210b98e34b1ea5 Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 8 May 2015 22:07:08 -0400 Subject: [PATCH 1/9] Organized file structure better --- VERSION.json | 5 ++ install/Installer.sh | 46 ------------------ src/{application => app}/.htaccess | 0 src/{application => app}/cache/.htaccess | 0 src/{application => app}/cache/index.html | 0 src/{application => app}/config/autoload.php | 0 src/{application => app}/config/config.php.sm | 0 src/{application => app}/config/constants.php | 0 .../config/database.php.sm | 0 src/{application => app}/config/doctypes.php | 0 .../config/foreign_chars.php | 0 src/{application => app}/config/hooks.php | 0 .../config/hybridauthlib.php | 0 src/{application => app}/config/index.html | 0 src/{application => app}/config/migration.php | 0 src/{application => app}/config/mimes.php | 0 src/{application => app}/config/profiler.php | 0 src/{application => app}/config/recaptcha.php | 0 src/{application => app}/config/routes.php | 0 src/{application => app}/config/smileys.php | 0 .../config/user_agents.php | 0 .../controllers/account.php | 0 .../controllers/alerts.php | 0 .../controllers/comments.php | 0 .../controllers/dashboard.php | 0 .../controllers/index.html | 0 src/{application => app}/controllers/main.php | 0 src/{application => app}/controllers/page.php | 0 .../controllers/people.php | 0 src/{application => app}/controllers/post.php | 0 .../controllers/search.php | 0 .../controllers/settings.php | 0 src/{application => app}/core/index.html | 0 src/{application => app}/errors/error_404.php | 0 src/{application => app}/errors/error_db.php | 0 .../errors/error_general.php | 0 src/{application => app}/errors/error_php.php | 0 src/{application => app}/errors/index.html | 0 .../helpers/MY_url_helper.php | 0 .../helpers/avatar_helper.php | 0 .../helpers/bbcode_helper.php | 0 .../helpers/format_post_helper.php | 0 src/{application => app}/helpers/index.html | 0 .../helpers/json_helper.php | 0 .../helpers/msg_helper.php | 0 .../helpers/php_session_helper.php | 0 .../helpers/validate_helper.php | 0 src/{application => app}/hooks/index.html | 0 src/{application => app}/hooks/user_hook.php | 0 src/{application => app}/index.html | 0 .../language/english/index.html | 0 src/{application => app}/language/index.html | 0 .../libraries/HybridAuthLib.php | 0 .../libraries/MY_form_validation.php | 0 .../libraries/Markdown.php | 0 .../libraries/Recaptcha.php | 0 src/{application => app}/libraries/alert.php | 0 .../libraries/custom_email.php | 0 src/{application => app}/libraries/events.php | 0 src/{application => app}/libraries/extras.php | 0 src/{application => app}/libraries/index.html | 0 .../libraries/mentions.php | 0 .../libraries/php_session.php | 0 src/{application => app}/libraries/points.php | 0 .../libraries/template.php | 0 src/{application => app}/logs/hybridauth.log | Bin src/{application => app}/logs/index.html | 0 .../models/account_model.php | 0 .../models/alerts_model.php | 0 .../models/comments_model.php | 0 .../models/employee_model.php | 0 src/{application => app}/models/index.html | 0 .../models/oauth_model.php | 0 .../models/people_model.php | 0 .../models/post_model.php | 0 .../models/search_model.php | 0 .../third_party/hybridauth/Hybrid/Auth.php | 0 .../hybridauth/Hybrid/Endpoint.php | 0 .../third_party/hybridauth/Hybrid/Error.php | 0 .../third_party/hybridauth/Hybrid/Logger.php | 0 .../hybridauth/Hybrid/Provider_Adapter.php | 0 .../hybridauth/Hybrid/Provider_Model.php | 0 .../Hybrid/Provider_Model_OAuth1.php | 0 .../Hybrid/Provider_Model_OAuth2.php | 0 .../Hybrid/Provider_Model_OpenID.php | 0 .../hybridauth/Hybrid/Providers/AOL.php | 0 .../hybridauth/Hybrid/Providers/Facebook.php | 0 .../Hybrid/Providers/Foursquare.php | 0 .../hybridauth/Hybrid/Providers/Google.php | 0 .../hybridauth/Hybrid/Providers/LinkedIn.php | 0 .../hybridauth/Hybrid/Providers/Live.php | 0 .../hybridauth/Hybrid/Providers/MySpace.php | 0 .../hybridauth/Hybrid/Providers/OpenID.php | 0 .../hybridauth/Hybrid/Providers/Twitter.php | 0 .../hybridauth/Hybrid/Providers/Yahoo.php | 0 .../third_party/hybridauth/Hybrid/Storage.php | 0 .../third_party/hybridauth/Hybrid/User.php | 0 .../hybridauth/Hybrid/User_Activity.php | 0 .../hybridauth/Hybrid/User_Contact.php | 0 .../hybridauth/Hybrid/User_Profile.php | 0 .../third_party/hybridauth/Hybrid/index.html | 0 .../Hybrid/resources/config.php.tpl | 0 .../hybridauth/Hybrid/resources/index.html | 0 .../Hybrid/resources/openid_policy.html | 0 .../Hybrid/resources/openid_realm.html | 0 .../Hybrid/resources/openid_xrds.xml | 0 .../thirdparty/Facebook/base_facebook.php | 0 .../Hybrid/thirdparty/Facebook/facebook.php | 0 .../Facebook/fb_ca_chain_bundle.crt | 0 .../Hybrid/thirdparty/LinkedIn/LinkedIn.php | 0 .../Hybrid/thirdparty/OAuth/OAuth.php | 0 .../Hybrid/thirdparty/OAuth/OAuth1Client.php | 0 .../Hybrid/thirdparty/OAuth/OAuth2Client.php | 0 .../Hybrid/thirdparty/OpenID/LightOpenID.php | 0 .../hybridauth/Hybrid/thirdparty/index.html | 0 .../third_party/hybridauth/index.php | 0 .../third_party/index.html | 0 .../views/account/forgot_password.php | 0 .../views/account/login.php | 0 .../views/account/oauth_buttons.php | 0 .../views/account/register.php | 0 .../views/account/reset_password | 0 src/{application => app}/views/dashboard.php | 0 .../views/emails/reset_password.php | 0 .../views/emails/template.php | 0 src/{application => app}/views/footer.php | 0 src/{application => app}/views/header.php | 0 src/{application => app}/views/home.php | 0 src/{application => app}/views/index.html | 0 src/{application => app}/views/navbar.php | 0 .../views/posts/comments.php | 0 .../views/posts/html_template.php | 0 .../views/posts/loading.php | 0 .../views/posts/post_box.php | 0 .../views/posts/report.php | 0 src/{application => app}/views/posts/view.php | 0 .../views/templates/hero.php | 0 .../views/templates/master.php | 0 .../views/templates/msg_box.php | 0 .../views/templates/no_script.php | 0 .../views/templates/validation_errors.php | 0 .../views/welcome_message.php | 0 src/index.php | 2 +- .../mxious.sublime-project | 0 .../mxious.sublime-workspace | 0 {install => utils}/sql/mxious.sql | 0 {src => vendor/licenses}/ci-license.txt | 0 147 files changed, 6 insertions(+), 47 deletions(-) create mode 100644 VERSION.json delete mode 100644 install/Installer.sh rename src/{application => app}/.htaccess (100%) rename src/{application => app}/cache/.htaccess (100%) rename src/{application => app}/cache/index.html (100%) rename src/{application => app}/config/autoload.php (100%) rename src/{application => app}/config/config.php.sm (100%) rename src/{application => app}/config/constants.php (100%) rename src/{application => app}/config/database.php.sm (100%) rename src/{application => app}/config/doctypes.php (100%) rename src/{application => app}/config/foreign_chars.php (100%) rename src/{application => app}/config/hooks.php (100%) rename src/{application => app}/config/hybridauthlib.php (100%) rename src/{application => app}/config/index.html (100%) rename src/{application => app}/config/migration.php (100%) rename src/{application => app}/config/mimes.php (100%) rename src/{application => app}/config/profiler.php (100%) rename src/{application => app}/config/recaptcha.php (100%) rename src/{application => app}/config/routes.php (100%) rename src/{application => app}/config/smileys.php (100%) rename src/{application => app}/config/user_agents.php (100%) rename src/{application => app}/controllers/account.php (100%) rename src/{application => app}/controllers/alerts.php (100%) rename src/{application => app}/controllers/comments.php (100%) rename src/{application => app}/controllers/dashboard.php (100%) rename src/{application => app}/controllers/index.html (100%) rename src/{application => app}/controllers/main.php (100%) rename src/{application => app}/controllers/page.php (100%) rename src/{application => app}/controllers/people.php (100%) rename src/{application => app}/controllers/post.php (100%) rename src/{application => app}/controllers/search.php (100%) rename src/{application => app}/controllers/settings.php (100%) rename src/{application => app}/core/index.html (100%) rename src/{application => app}/errors/error_404.php (100%) rename src/{application => app}/errors/error_db.php (100%) rename src/{application => app}/errors/error_general.php (100%) rename src/{application => app}/errors/error_php.php (100%) rename src/{application => app}/errors/index.html (100%) rename src/{application => app}/helpers/MY_url_helper.php (100%) rename src/{application => app}/helpers/avatar_helper.php (100%) rename src/{application => app}/helpers/bbcode_helper.php (100%) rename src/{application => app}/helpers/format_post_helper.php (100%) rename src/{application => app}/helpers/index.html (100%) rename src/{application => app}/helpers/json_helper.php (100%) rename src/{application => app}/helpers/msg_helper.php (100%) rename src/{application => app}/helpers/php_session_helper.php (100%) rename src/{application => app}/helpers/validate_helper.php (100%) rename src/{application => app}/hooks/index.html (100%) rename src/{application => app}/hooks/user_hook.php (100%) rename src/{application => app}/index.html (100%) rename src/{application => app}/language/english/index.html (100%) rename src/{application => app}/language/index.html (100%) rename src/{application => app}/libraries/HybridAuthLib.php (100%) rename src/{application => app}/libraries/MY_form_validation.php (100%) rename src/{application => app}/libraries/Markdown.php (100%) rename src/{application => app}/libraries/Recaptcha.php (100%) rename src/{application => app}/libraries/alert.php (100%) rename src/{application => app}/libraries/custom_email.php (100%) rename src/{application => app}/libraries/events.php (100%) rename src/{application => app}/libraries/extras.php (100%) rename src/{application => app}/libraries/index.html (100%) rename src/{application => app}/libraries/mentions.php (100%) rename src/{application => app}/libraries/php_session.php (100%) rename src/{application => app}/libraries/points.php (100%) rename src/{application => app}/libraries/template.php (100%) rename src/{application => app}/logs/hybridauth.log (100%) rename src/{application => app}/logs/index.html (100%) rename src/{application => app}/models/account_model.php (100%) rename src/{application => app}/models/alerts_model.php (100%) rename src/{application => app}/models/comments_model.php (100%) rename src/{application => app}/models/employee_model.php (100%) rename src/{application => app}/models/index.html (100%) rename src/{application => app}/models/oauth_model.php (100%) rename src/{application => app}/models/people_model.php (100%) rename src/{application => app}/models/post_model.php (100%) rename src/{application => app}/models/search_model.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Auth.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Endpoint.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Error.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Logger.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Provider_Adapter.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Provider_Model.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Provider_Model_OAuth1.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Provider_Model_OAuth2.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Provider_Model_OpenID.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/AOL.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/Facebook.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/Foursquare.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/Google.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/LinkedIn.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/Live.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/MySpace.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/OpenID.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/Twitter.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Providers/Yahoo.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/Storage.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/User.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/User_Activity.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/User_Contact.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/User_Profile.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/index.html (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/resources/config.php.tpl (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/resources/index.html (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/resources/openid_policy.html (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/resources/openid_realm.html (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/resources/openid_xrds.xml (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/Facebook/facebook.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php (100%) rename src/{application => app}/third_party/hybridauth/Hybrid/thirdparty/index.html (100%) rename src/{application => app}/third_party/hybridauth/index.php (100%) rename src/{application => app}/third_party/index.html (100%) rename src/{application => app}/views/account/forgot_password.php (100%) rename src/{application => app}/views/account/login.php (100%) rename src/{application => app}/views/account/oauth_buttons.php (100%) rename src/{application => app}/views/account/register.php (100%) rename src/{application => app}/views/account/reset_password (100%) rename src/{application => app}/views/dashboard.php (100%) rename src/{application => app}/views/emails/reset_password.php (100%) rename src/{application => app}/views/emails/template.php (100%) rename src/{application => app}/views/footer.php (100%) rename src/{application => app}/views/header.php (100%) rename src/{application => app}/views/home.php (100%) rename src/{application => app}/views/index.html (100%) rename src/{application => app}/views/navbar.php (100%) rename src/{application => app}/views/posts/comments.php (100%) rename src/{application => app}/views/posts/html_template.php (100%) rename src/{application => app}/views/posts/loading.php (100%) rename src/{application => app}/views/posts/post_box.php (100%) rename src/{application => app}/views/posts/report.php (100%) rename src/{application => app}/views/posts/view.php (100%) rename src/{application => app}/views/templates/hero.php (100%) rename src/{application => app}/views/templates/master.php (100%) rename src/{application => app}/views/templates/msg_box.php (100%) rename src/{application => app}/views/templates/no_script.php (100%) rename src/{application => app}/views/templates/validation_errors.php (100%) rename src/{application => app}/views/welcome_message.php (100%) rename mxious.sublime-project => utils/mxious.sublime-project (100%) rename mxious.sublime-workspace => utils/mxious.sublime-workspace (100%) rename {install => utils}/sql/mxious.sql (100%) rename {src => vendor/licenses}/ci-license.txt (100%) diff --git a/VERSION.json b/VERSION.json new file mode 100644 index 0000000..3f3a303 --- /dev/null +++ b/VERSION.json @@ -0,0 +1,5 @@ +{ + "version":"1.0.0", + "type": "development", + "cycle": "pre-release" +} \ No newline at end of file diff --git a/install/Installer.sh b/install/Installer.sh deleted file mode 100644 index 1923e29..0000000 --- a/install/Installer.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Mxious Linux Instance Installer -# (copy) Mxious 2013-2014 - -echo "Welcome to the Mxious Linux Instance Installer." - -if [[ $UID != 0 ]]; then - echo "This script requires sudo:" - echo "sudo $0 $*" - exit 1 -fi - -echo "-----------------------------------------------------" -echo "Let's start by asking a few essential questions." -echo "-----------------------------------------------------" -echo "" -echo "What is your mysql username? Input it now:" -read mysqluser -echo "" -echo "Where do you want the instance to be installed? Input a full path WITH TRAILING SLASH and press enter: " -read path -echo "Instance will be installed in directory $path." -echo "" -echo "Where is the Mxious SQL dump located? Full path WITHOUT final slash:" -read sqlpath -echo "" -echo "-----------------------------------------------------" -echo "" -echo "Starting install. Get some coffee or something, this will take a while." -cd $path -echo "" -git clone https://github.com/Mxious/Mxious -echo "Cloned, installed files." -echo "" -echo "-----------------------------------------------------" -echo "" -echo "Firing up MySQL. Please wait and input your password when requested." -mysql -u $mysqluser -p -e "create database Mxious;" -mysql -u $mysqluser -p Mxious < $sqlpath/Mxious.sql -cd $path/Mxious -nano application/config/database.php.sm -mv application/config/database.php.sm application/config/database.php -mv application/config/config.php.sm application/config/config.php - -echo "Finished installing. Thank you for coding with Crunch D&D!" \ No newline at end of file diff --git a/src/application/.htaccess b/src/app/.htaccess similarity index 100% rename from src/application/.htaccess rename to src/app/.htaccess diff --git a/src/application/cache/.htaccess b/src/app/cache/.htaccess similarity index 100% rename from src/application/cache/.htaccess rename to src/app/cache/.htaccess diff --git a/src/application/cache/index.html b/src/app/cache/index.html similarity index 100% rename from src/application/cache/index.html rename to src/app/cache/index.html diff --git a/src/application/config/autoload.php b/src/app/config/autoload.php similarity index 100% rename from src/application/config/autoload.php rename to src/app/config/autoload.php diff --git a/src/application/config/config.php.sm b/src/app/config/config.php.sm similarity index 100% rename from src/application/config/config.php.sm rename to src/app/config/config.php.sm diff --git a/src/application/config/constants.php b/src/app/config/constants.php similarity index 100% rename from src/application/config/constants.php rename to src/app/config/constants.php diff --git a/src/application/config/database.php.sm b/src/app/config/database.php.sm similarity index 100% rename from src/application/config/database.php.sm rename to src/app/config/database.php.sm diff --git a/src/application/config/doctypes.php b/src/app/config/doctypes.php similarity index 100% rename from src/application/config/doctypes.php rename to src/app/config/doctypes.php diff --git a/src/application/config/foreign_chars.php b/src/app/config/foreign_chars.php similarity index 100% rename from src/application/config/foreign_chars.php rename to src/app/config/foreign_chars.php diff --git a/src/application/config/hooks.php b/src/app/config/hooks.php similarity index 100% rename from src/application/config/hooks.php rename to src/app/config/hooks.php diff --git a/src/application/config/hybridauthlib.php b/src/app/config/hybridauthlib.php similarity index 100% rename from src/application/config/hybridauthlib.php rename to src/app/config/hybridauthlib.php diff --git a/src/application/config/index.html b/src/app/config/index.html similarity index 100% rename from src/application/config/index.html rename to src/app/config/index.html diff --git a/src/application/config/migration.php b/src/app/config/migration.php similarity index 100% rename from src/application/config/migration.php rename to src/app/config/migration.php diff --git a/src/application/config/mimes.php b/src/app/config/mimes.php similarity index 100% rename from src/application/config/mimes.php rename to src/app/config/mimes.php diff --git a/src/application/config/profiler.php b/src/app/config/profiler.php similarity index 100% rename from src/application/config/profiler.php rename to src/app/config/profiler.php diff --git a/src/application/config/recaptcha.php b/src/app/config/recaptcha.php similarity index 100% rename from src/application/config/recaptcha.php rename to src/app/config/recaptcha.php diff --git a/src/application/config/routes.php b/src/app/config/routes.php similarity index 100% rename from src/application/config/routes.php rename to src/app/config/routes.php diff --git a/src/application/config/smileys.php b/src/app/config/smileys.php similarity index 100% rename from src/application/config/smileys.php rename to src/app/config/smileys.php diff --git a/src/application/config/user_agents.php b/src/app/config/user_agents.php similarity index 100% rename from src/application/config/user_agents.php rename to src/app/config/user_agents.php diff --git a/src/application/controllers/account.php b/src/app/controllers/account.php similarity index 100% rename from src/application/controllers/account.php rename to src/app/controllers/account.php diff --git a/src/application/controllers/alerts.php b/src/app/controllers/alerts.php similarity index 100% rename from src/application/controllers/alerts.php rename to src/app/controllers/alerts.php diff --git a/src/application/controllers/comments.php b/src/app/controllers/comments.php similarity index 100% rename from src/application/controllers/comments.php rename to src/app/controllers/comments.php diff --git a/src/application/controllers/dashboard.php b/src/app/controllers/dashboard.php similarity index 100% rename from src/application/controllers/dashboard.php rename to src/app/controllers/dashboard.php diff --git a/src/application/controllers/index.html b/src/app/controllers/index.html similarity index 100% rename from src/application/controllers/index.html rename to src/app/controllers/index.html diff --git a/src/application/controllers/main.php b/src/app/controllers/main.php similarity index 100% rename from src/application/controllers/main.php rename to src/app/controllers/main.php diff --git a/src/application/controllers/page.php b/src/app/controllers/page.php similarity index 100% rename from src/application/controllers/page.php rename to src/app/controllers/page.php diff --git a/src/application/controllers/people.php b/src/app/controllers/people.php similarity index 100% rename from src/application/controllers/people.php rename to src/app/controllers/people.php diff --git a/src/application/controllers/post.php b/src/app/controllers/post.php similarity index 100% rename from src/application/controllers/post.php rename to src/app/controllers/post.php diff --git a/src/application/controllers/search.php b/src/app/controllers/search.php similarity index 100% rename from src/application/controllers/search.php rename to src/app/controllers/search.php diff --git a/src/application/controllers/settings.php b/src/app/controllers/settings.php similarity index 100% rename from src/application/controllers/settings.php rename to src/app/controllers/settings.php diff --git a/src/application/core/index.html b/src/app/core/index.html similarity index 100% rename from src/application/core/index.html rename to src/app/core/index.html diff --git a/src/application/errors/error_404.php b/src/app/errors/error_404.php similarity index 100% rename from src/application/errors/error_404.php rename to src/app/errors/error_404.php diff --git a/src/application/errors/error_db.php b/src/app/errors/error_db.php similarity index 100% rename from src/application/errors/error_db.php rename to src/app/errors/error_db.php diff --git a/src/application/errors/error_general.php b/src/app/errors/error_general.php similarity index 100% rename from src/application/errors/error_general.php rename to src/app/errors/error_general.php diff --git a/src/application/errors/error_php.php b/src/app/errors/error_php.php similarity index 100% rename from src/application/errors/error_php.php rename to src/app/errors/error_php.php diff --git a/src/application/errors/index.html b/src/app/errors/index.html similarity index 100% rename from src/application/errors/index.html rename to src/app/errors/index.html diff --git a/src/application/helpers/MY_url_helper.php b/src/app/helpers/MY_url_helper.php similarity index 100% rename from src/application/helpers/MY_url_helper.php rename to src/app/helpers/MY_url_helper.php diff --git a/src/application/helpers/avatar_helper.php b/src/app/helpers/avatar_helper.php similarity index 100% rename from src/application/helpers/avatar_helper.php rename to src/app/helpers/avatar_helper.php diff --git a/src/application/helpers/bbcode_helper.php b/src/app/helpers/bbcode_helper.php similarity index 100% rename from src/application/helpers/bbcode_helper.php rename to src/app/helpers/bbcode_helper.php diff --git a/src/application/helpers/format_post_helper.php b/src/app/helpers/format_post_helper.php similarity index 100% rename from src/application/helpers/format_post_helper.php rename to src/app/helpers/format_post_helper.php diff --git a/src/application/helpers/index.html b/src/app/helpers/index.html similarity index 100% rename from src/application/helpers/index.html rename to src/app/helpers/index.html diff --git a/src/application/helpers/json_helper.php b/src/app/helpers/json_helper.php similarity index 100% rename from src/application/helpers/json_helper.php rename to src/app/helpers/json_helper.php diff --git a/src/application/helpers/msg_helper.php b/src/app/helpers/msg_helper.php similarity index 100% rename from src/application/helpers/msg_helper.php rename to src/app/helpers/msg_helper.php diff --git a/src/application/helpers/php_session_helper.php b/src/app/helpers/php_session_helper.php similarity index 100% rename from src/application/helpers/php_session_helper.php rename to src/app/helpers/php_session_helper.php diff --git a/src/application/helpers/validate_helper.php b/src/app/helpers/validate_helper.php similarity index 100% rename from src/application/helpers/validate_helper.php rename to src/app/helpers/validate_helper.php diff --git a/src/application/hooks/index.html b/src/app/hooks/index.html similarity index 100% rename from src/application/hooks/index.html rename to src/app/hooks/index.html diff --git a/src/application/hooks/user_hook.php b/src/app/hooks/user_hook.php similarity index 100% rename from src/application/hooks/user_hook.php rename to src/app/hooks/user_hook.php diff --git a/src/application/index.html b/src/app/index.html similarity index 100% rename from src/application/index.html rename to src/app/index.html diff --git a/src/application/language/english/index.html b/src/app/language/english/index.html similarity index 100% rename from src/application/language/english/index.html rename to src/app/language/english/index.html diff --git a/src/application/language/index.html b/src/app/language/index.html similarity index 100% rename from src/application/language/index.html rename to src/app/language/index.html diff --git a/src/application/libraries/HybridAuthLib.php b/src/app/libraries/HybridAuthLib.php similarity index 100% rename from src/application/libraries/HybridAuthLib.php rename to src/app/libraries/HybridAuthLib.php diff --git a/src/application/libraries/MY_form_validation.php b/src/app/libraries/MY_form_validation.php similarity index 100% rename from src/application/libraries/MY_form_validation.php rename to src/app/libraries/MY_form_validation.php diff --git a/src/application/libraries/Markdown.php b/src/app/libraries/Markdown.php similarity index 100% rename from src/application/libraries/Markdown.php rename to src/app/libraries/Markdown.php diff --git a/src/application/libraries/Recaptcha.php b/src/app/libraries/Recaptcha.php similarity index 100% rename from src/application/libraries/Recaptcha.php rename to src/app/libraries/Recaptcha.php diff --git a/src/application/libraries/alert.php b/src/app/libraries/alert.php similarity index 100% rename from src/application/libraries/alert.php rename to src/app/libraries/alert.php diff --git a/src/application/libraries/custom_email.php b/src/app/libraries/custom_email.php similarity index 100% rename from src/application/libraries/custom_email.php rename to src/app/libraries/custom_email.php diff --git a/src/application/libraries/events.php b/src/app/libraries/events.php similarity index 100% rename from src/application/libraries/events.php rename to src/app/libraries/events.php diff --git a/src/application/libraries/extras.php b/src/app/libraries/extras.php similarity index 100% rename from src/application/libraries/extras.php rename to src/app/libraries/extras.php diff --git a/src/application/libraries/index.html b/src/app/libraries/index.html similarity index 100% rename from src/application/libraries/index.html rename to src/app/libraries/index.html diff --git a/src/application/libraries/mentions.php b/src/app/libraries/mentions.php similarity index 100% rename from src/application/libraries/mentions.php rename to src/app/libraries/mentions.php diff --git a/src/application/libraries/php_session.php b/src/app/libraries/php_session.php similarity index 100% rename from src/application/libraries/php_session.php rename to src/app/libraries/php_session.php diff --git a/src/application/libraries/points.php b/src/app/libraries/points.php similarity index 100% rename from src/application/libraries/points.php rename to src/app/libraries/points.php diff --git a/src/application/libraries/template.php b/src/app/libraries/template.php similarity index 100% rename from src/application/libraries/template.php rename to src/app/libraries/template.php diff --git a/src/application/logs/hybridauth.log b/src/app/logs/hybridauth.log similarity index 100% rename from src/application/logs/hybridauth.log rename to src/app/logs/hybridauth.log diff --git a/src/application/logs/index.html b/src/app/logs/index.html similarity index 100% rename from src/application/logs/index.html rename to src/app/logs/index.html diff --git a/src/application/models/account_model.php b/src/app/models/account_model.php similarity index 100% rename from src/application/models/account_model.php rename to src/app/models/account_model.php diff --git a/src/application/models/alerts_model.php b/src/app/models/alerts_model.php similarity index 100% rename from src/application/models/alerts_model.php rename to src/app/models/alerts_model.php diff --git a/src/application/models/comments_model.php b/src/app/models/comments_model.php similarity index 100% rename from src/application/models/comments_model.php rename to src/app/models/comments_model.php diff --git a/src/application/models/employee_model.php b/src/app/models/employee_model.php similarity index 100% rename from src/application/models/employee_model.php rename to src/app/models/employee_model.php diff --git a/src/application/models/index.html b/src/app/models/index.html similarity index 100% rename from src/application/models/index.html rename to src/app/models/index.html diff --git a/src/application/models/oauth_model.php b/src/app/models/oauth_model.php similarity index 100% rename from src/application/models/oauth_model.php rename to src/app/models/oauth_model.php diff --git a/src/application/models/people_model.php b/src/app/models/people_model.php similarity index 100% rename from src/application/models/people_model.php rename to src/app/models/people_model.php diff --git a/src/application/models/post_model.php b/src/app/models/post_model.php similarity index 100% rename from src/application/models/post_model.php rename to src/app/models/post_model.php diff --git a/src/application/models/search_model.php b/src/app/models/search_model.php similarity index 100% rename from src/application/models/search_model.php rename to src/app/models/search_model.php diff --git a/src/application/third_party/hybridauth/Hybrid/Auth.php b/src/app/third_party/hybridauth/Hybrid/Auth.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Auth.php rename to src/app/third_party/hybridauth/Hybrid/Auth.php diff --git a/src/application/third_party/hybridauth/Hybrid/Endpoint.php b/src/app/third_party/hybridauth/Hybrid/Endpoint.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Endpoint.php rename to src/app/third_party/hybridauth/Hybrid/Endpoint.php diff --git a/src/application/third_party/hybridauth/Hybrid/Error.php b/src/app/third_party/hybridauth/Hybrid/Error.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Error.php rename to src/app/third_party/hybridauth/Hybrid/Error.php diff --git a/src/application/third_party/hybridauth/Hybrid/Logger.php b/src/app/third_party/hybridauth/Hybrid/Logger.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Logger.php rename to src/app/third_party/hybridauth/Hybrid/Logger.php diff --git a/src/application/third_party/hybridauth/Hybrid/Provider_Adapter.php b/src/app/third_party/hybridauth/Hybrid/Provider_Adapter.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Provider_Adapter.php rename to src/app/third_party/hybridauth/Hybrid/Provider_Adapter.php diff --git a/src/application/third_party/hybridauth/Hybrid/Provider_Model.php b/src/app/third_party/hybridauth/Hybrid/Provider_Model.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Provider_Model.php rename to src/app/third_party/hybridauth/Hybrid/Provider_Model.php diff --git a/src/application/third_party/hybridauth/Hybrid/Provider_Model_OAuth1.php b/src/app/third_party/hybridauth/Hybrid/Provider_Model_OAuth1.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Provider_Model_OAuth1.php rename to src/app/third_party/hybridauth/Hybrid/Provider_Model_OAuth1.php diff --git a/src/application/third_party/hybridauth/Hybrid/Provider_Model_OAuth2.php b/src/app/third_party/hybridauth/Hybrid/Provider_Model_OAuth2.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Provider_Model_OAuth2.php rename to src/app/third_party/hybridauth/Hybrid/Provider_Model_OAuth2.php diff --git a/src/application/third_party/hybridauth/Hybrid/Provider_Model_OpenID.php b/src/app/third_party/hybridauth/Hybrid/Provider_Model_OpenID.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Provider_Model_OpenID.php rename to src/app/third_party/hybridauth/Hybrid/Provider_Model_OpenID.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/AOL.php b/src/app/third_party/hybridauth/Hybrid/Providers/AOL.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/AOL.php rename to src/app/third_party/hybridauth/Hybrid/Providers/AOL.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/Facebook.php b/src/app/third_party/hybridauth/Hybrid/Providers/Facebook.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/Facebook.php rename to src/app/third_party/hybridauth/Hybrid/Providers/Facebook.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/Foursquare.php b/src/app/third_party/hybridauth/Hybrid/Providers/Foursquare.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/Foursquare.php rename to src/app/third_party/hybridauth/Hybrid/Providers/Foursquare.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/Google.php b/src/app/third_party/hybridauth/Hybrid/Providers/Google.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/Google.php rename to src/app/third_party/hybridauth/Hybrid/Providers/Google.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/LinkedIn.php b/src/app/third_party/hybridauth/Hybrid/Providers/LinkedIn.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/LinkedIn.php rename to src/app/third_party/hybridauth/Hybrid/Providers/LinkedIn.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/Live.php b/src/app/third_party/hybridauth/Hybrid/Providers/Live.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/Live.php rename to src/app/third_party/hybridauth/Hybrid/Providers/Live.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/MySpace.php b/src/app/third_party/hybridauth/Hybrid/Providers/MySpace.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/MySpace.php rename to src/app/third_party/hybridauth/Hybrid/Providers/MySpace.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/OpenID.php b/src/app/third_party/hybridauth/Hybrid/Providers/OpenID.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/OpenID.php rename to src/app/third_party/hybridauth/Hybrid/Providers/OpenID.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/Twitter.php b/src/app/third_party/hybridauth/Hybrid/Providers/Twitter.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/Twitter.php rename to src/app/third_party/hybridauth/Hybrid/Providers/Twitter.php diff --git a/src/application/third_party/hybridauth/Hybrid/Providers/Yahoo.php b/src/app/third_party/hybridauth/Hybrid/Providers/Yahoo.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Providers/Yahoo.php rename to src/app/third_party/hybridauth/Hybrid/Providers/Yahoo.php diff --git a/src/application/third_party/hybridauth/Hybrid/Storage.php b/src/app/third_party/hybridauth/Hybrid/Storage.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/Storage.php rename to src/app/third_party/hybridauth/Hybrid/Storage.php diff --git a/src/application/third_party/hybridauth/Hybrid/User.php b/src/app/third_party/hybridauth/Hybrid/User.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/User.php rename to src/app/third_party/hybridauth/Hybrid/User.php diff --git a/src/application/third_party/hybridauth/Hybrid/User_Activity.php b/src/app/third_party/hybridauth/Hybrid/User_Activity.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/User_Activity.php rename to src/app/third_party/hybridauth/Hybrid/User_Activity.php diff --git a/src/application/third_party/hybridauth/Hybrid/User_Contact.php b/src/app/third_party/hybridauth/Hybrid/User_Contact.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/User_Contact.php rename to src/app/third_party/hybridauth/Hybrid/User_Contact.php diff --git a/src/application/third_party/hybridauth/Hybrid/User_Profile.php b/src/app/third_party/hybridauth/Hybrid/User_Profile.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/User_Profile.php rename to src/app/third_party/hybridauth/Hybrid/User_Profile.php diff --git a/src/application/third_party/hybridauth/Hybrid/index.html b/src/app/third_party/hybridauth/Hybrid/index.html similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/index.html rename to src/app/third_party/hybridauth/Hybrid/index.html diff --git a/src/application/third_party/hybridauth/Hybrid/resources/config.php.tpl b/src/app/third_party/hybridauth/Hybrid/resources/config.php.tpl similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/resources/config.php.tpl rename to src/app/third_party/hybridauth/Hybrid/resources/config.php.tpl diff --git a/src/application/third_party/hybridauth/Hybrid/resources/index.html b/src/app/third_party/hybridauth/Hybrid/resources/index.html similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/resources/index.html rename to src/app/third_party/hybridauth/Hybrid/resources/index.html diff --git a/src/application/third_party/hybridauth/Hybrid/resources/openid_policy.html b/src/app/third_party/hybridauth/Hybrid/resources/openid_policy.html similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/resources/openid_policy.html rename to src/app/third_party/hybridauth/Hybrid/resources/openid_policy.html diff --git a/src/application/third_party/hybridauth/Hybrid/resources/openid_realm.html b/src/app/third_party/hybridauth/Hybrid/resources/openid_realm.html similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/resources/openid_realm.html rename to src/app/third_party/hybridauth/Hybrid/resources/openid_realm.html diff --git a/src/application/third_party/hybridauth/Hybrid/resources/openid_xrds.xml b/src/app/third_party/hybridauth/Hybrid/resources/openid_xrds.xml similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/resources/openid_xrds.xml rename to src/app/third_party/hybridauth/Hybrid/resources/openid_xrds.xml diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/Facebook/facebook.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/Facebook/facebook.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/Facebook/facebook.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/Facebook/facebook.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt b/src/app/third_party/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt rename to src/app/third_party/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php b/src/app/third_party/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php rename to src/app/third_party/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php diff --git a/src/application/third_party/hybridauth/Hybrid/thirdparty/index.html b/src/app/third_party/hybridauth/Hybrid/thirdparty/index.html similarity index 100% rename from src/application/third_party/hybridauth/Hybrid/thirdparty/index.html rename to src/app/third_party/hybridauth/Hybrid/thirdparty/index.html diff --git a/src/application/third_party/hybridauth/index.php b/src/app/third_party/hybridauth/index.php similarity index 100% rename from src/application/third_party/hybridauth/index.php rename to src/app/third_party/hybridauth/index.php diff --git a/src/application/third_party/index.html b/src/app/third_party/index.html similarity index 100% rename from src/application/third_party/index.html rename to src/app/third_party/index.html diff --git a/src/application/views/account/forgot_password.php b/src/app/views/account/forgot_password.php similarity index 100% rename from src/application/views/account/forgot_password.php rename to src/app/views/account/forgot_password.php diff --git a/src/application/views/account/login.php b/src/app/views/account/login.php similarity index 100% rename from src/application/views/account/login.php rename to src/app/views/account/login.php diff --git a/src/application/views/account/oauth_buttons.php b/src/app/views/account/oauth_buttons.php similarity index 100% rename from src/application/views/account/oauth_buttons.php rename to src/app/views/account/oauth_buttons.php diff --git a/src/application/views/account/register.php b/src/app/views/account/register.php similarity index 100% rename from src/application/views/account/register.php rename to src/app/views/account/register.php diff --git a/src/application/views/account/reset_password b/src/app/views/account/reset_password similarity index 100% rename from src/application/views/account/reset_password rename to src/app/views/account/reset_password diff --git a/src/application/views/dashboard.php b/src/app/views/dashboard.php similarity index 100% rename from src/application/views/dashboard.php rename to src/app/views/dashboard.php diff --git a/src/application/views/emails/reset_password.php b/src/app/views/emails/reset_password.php similarity index 100% rename from src/application/views/emails/reset_password.php rename to src/app/views/emails/reset_password.php diff --git a/src/application/views/emails/template.php b/src/app/views/emails/template.php similarity index 100% rename from src/application/views/emails/template.php rename to src/app/views/emails/template.php diff --git a/src/application/views/footer.php b/src/app/views/footer.php similarity index 100% rename from src/application/views/footer.php rename to src/app/views/footer.php diff --git a/src/application/views/header.php b/src/app/views/header.php similarity index 100% rename from src/application/views/header.php rename to src/app/views/header.php diff --git a/src/application/views/home.php b/src/app/views/home.php similarity index 100% rename from src/application/views/home.php rename to src/app/views/home.php diff --git a/src/application/views/index.html b/src/app/views/index.html similarity index 100% rename from src/application/views/index.html rename to src/app/views/index.html diff --git a/src/application/views/navbar.php b/src/app/views/navbar.php similarity index 100% rename from src/application/views/navbar.php rename to src/app/views/navbar.php diff --git a/src/application/views/posts/comments.php b/src/app/views/posts/comments.php similarity index 100% rename from src/application/views/posts/comments.php rename to src/app/views/posts/comments.php diff --git a/src/application/views/posts/html_template.php b/src/app/views/posts/html_template.php similarity index 100% rename from src/application/views/posts/html_template.php rename to src/app/views/posts/html_template.php diff --git a/src/application/views/posts/loading.php b/src/app/views/posts/loading.php similarity index 100% rename from src/application/views/posts/loading.php rename to src/app/views/posts/loading.php diff --git a/src/application/views/posts/post_box.php b/src/app/views/posts/post_box.php similarity index 100% rename from src/application/views/posts/post_box.php rename to src/app/views/posts/post_box.php diff --git a/src/application/views/posts/report.php b/src/app/views/posts/report.php similarity index 100% rename from src/application/views/posts/report.php rename to src/app/views/posts/report.php diff --git a/src/application/views/posts/view.php b/src/app/views/posts/view.php similarity index 100% rename from src/application/views/posts/view.php rename to src/app/views/posts/view.php diff --git a/src/application/views/templates/hero.php b/src/app/views/templates/hero.php similarity index 100% rename from src/application/views/templates/hero.php rename to src/app/views/templates/hero.php diff --git a/src/application/views/templates/master.php b/src/app/views/templates/master.php similarity index 100% rename from src/application/views/templates/master.php rename to src/app/views/templates/master.php diff --git a/src/application/views/templates/msg_box.php b/src/app/views/templates/msg_box.php similarity index 100% rename from src/application/views/templates/msg_box.php rename to src/app/views/templates/msg_box.php diff --git a/src/application/views/templates/no_script.php b/src/app/views/templates/no_script.php similarity index 100% rename from src/application/views/templates/no_script.php rename to src/app/views/templates/no_script.php diff --git a/src/application/views/templates/validation_errors.php b/src/app/views/templates/validation_errors.php similarity index 100% rename from src/application/views/templates/validation_errors.php rename to src/app/views/templates/validation_errors.php diff --git a/src/application/views/welcome_message.php b/src/app/views/welcome_message.php similarity index 100% rename from src/application/views/welcome_message.php rename to src/app/views/welcome_message.php diff --git a/src/index.php b/src/index.php index 95944f6..a6c4af1 100644 --- a/src/index.php +++ b/src/index.php @@ -73,7 +73,7 @@ * NO TRAILING SLASH! * */ - $application_folder = 'application'; + $application_folder = 'app'; /* * -------------------------------------------------------------------- diff --git a/mxious.sublime-project b/utils/mxious.sublime-project similarity index 100% rename from mxious.sublime-project rename to utils/mxious.sublime-project diff --git a/mxious.sublime-workspace b/utils/mxious.sublime-workspace similarity index 100% rename from mxious.sublime-workspace rename to utils/mxious.sublime-workspace diff --git a/install/sql/mxious.sql b/utils/sql/mxious.sql similarity index 100% rename from install/sql/mxious.sql rename to utils/sql/mxious.sql diff --git a/src/ci-license.txt b/vendor/licenses/ci-license.txt similarity index 100% rename from src/ci-license.txt rename to vendor/licenses/ci-license.txt From 4a3bec850d68471269c2ccb87eb6d143f3408398 Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 8 May 2015 22:22:25 -0400 Subject: [PATCH 2/9] Fixed ignored files --- .gitignore | 6 ++++++ src/.gitignore | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .gitignore delete mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..510a8ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +src/*/avatars +src/*/avatars/* +src/application/config/database.php +src/src/application/config/config.php +src/application/config/database.php.sm +src/application/config/config.php.sm \ No newline at end of file diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 22778bf..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*/avatars -*/avatars/* -application/config/database.php -application/config/config.php -application/config/database.php.sm -application/config/config.php.sm \ No newline at end of file From 9fcfd580f041604f18829582687219183f1c7ae5 Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 8 May 2015 23:10:19 -0400 Subject: [PATCH 3/9] Fixed ignored files --- .gitignore | 8 +-- src/app/config/{config.php.sm => config.php} | 0 src/app/config/database.php.sm | 69 -------------------- 3 files changed, 4 insertions(+), 73 deletions(-) rename src/app/config/{config.php.sm => config.php} (100%) delete mode 100644 src/app/config/database.php.sm diff --git a/.gitignore b/.gitignore index 510a8ef..bb9b8ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ src/*/avatars src/*/avatars/* -src/application/config/database.php -src/src/application/config/config.php -src/application/config/database.php.sm -src/application/config/config.php.sm \ No newline at end of file +src/app/config/database.php +src/src/app/config/config.php +src/app/config/database.php.sm +src/app/config/config.php.sm \ No newline at end of file diff --git a/src/app/config/config.php.sm b/src/app/config/config.php similarity index 100% rename from src/app/config/config.php.sm rename to src/app/config/config.php diff --git a/src/app/config/database.php.sm b/src/app/config/database.php.sm deleted file mode 100644 index c8dbbf7..0000000 --- a/src/app/config/database.php.sm +++ /dev/null @@ -1,69 +0,0 @@ - Date: Fri, 8 May 2015 23:13:14 -0400 Subject: [PATCH 4/9] Set REGISTER_REDIRECT constant to / since dashboard will be a dynamic homepage --- src/app/config/constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/constants.php b/src/app/config/constants.php index b89453a..4a08429 100644 --- a/src/app/config/constants.php +++ b/src/app/config/constants.php @@ -10,7 +10,7 @@ */ // Page to go to when user first registers -define('REGISTER_REDIRECT', 'dashboard'); +define('REGISTER_REDIRECT', '/'); // Email address for sys emails define('SYS_EMAIL_FROM', 'noreply@alphasquare.us'); From 20f94d9a395640767d098a56e568205e2ad91518 Mon Sep 17 00:00:00 2001 From: Sergio Diaz Date: Sat, 9 May 2015 14:09:30 -0400 Subject: [PATCH 5/9] Bump VERSION.json --- VERSION.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.json b/VERSION.json index 3f3a303..1a247e7 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,5 +1,5 @@ { - "version":"1.0.0", + "version":"1.0.1", "type": "development", - "cycle": "pre-release" -} \ No newline at end of file + "cycle": "development" +} From eb277d71cc1083eebbebcbf57800e62b0c6ed849 Mon Sep 17 00:00:00 2001 From: Sergio Diaz Date: Sat, 9 May 2015 14:23:23 -0400 Subject: [PATCH 6/9] Added upcoming build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 867323e..9e49e48 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Mxious -[![Code Climate](https://codeclimate.com/github/Mxious/Mxious/badges/gpa.svg)](https://codeclimate.com/github/Mxious/Mxious) +[![Build Status](https://travis-ci.org/Mxious/Mxious.svg)](https://travis-ci.org/Mxious/Mxious) [![Code Climate](https://codeclimate.com/github/Mxious/Mxious/badges/gpa.svg)](https://codeclimate.com/github/Mxious/Mxious) Source code for the Mxious social music application. From 94f11dfd0323ed30cf51fda316db43ddc5e16323 Mon Sep 17 00:00:00 2001 From: Sergio Diaz Date: Sat, 9 May 2015 14:40:25 -0400 Subject: [PATCH 7/9] Add Gitter integration --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e49e48..f149bb9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Mxious -[![Build Status](https://travis-ci.org/Mxious/Mxious.svg)](https://travis-ci.org/Mxious/Mxious) [![Code Climate](https://codeclimate.com/github/Mxious/Mxious/badges/gpa.svg)](https://codeclimate.com/github/Mxious/Mxious) +[![Build Status](https://travis-ci.org/Mxious/Mxious.svg)](https://travis-ci.org/Mxious/Mxious) [![Code Climate](https://codeclimate.com/github/Mxious/Mxious/badges/gpa.svg)](https://codeclimate.com/github/Mxious/Mxious) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Mxious/Mxious?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Source code for the Mxious social music application. From 645dc14ccea35b761b3d62311648e21a1fa6b9f3 Mon Sep 17 00:00:00 2001 From: Sergio Date: Sat, 9 May 2015 21:11:59 -0400 Subject: [PATCH 8/9] Fixed feed and JS --- src/app/controllers/main.php | 71 +++++++++++++++++++++--------- src/app/views/home.php | 4 +- src/app/views/templates/master.php | 2 +- src/assets/js/dash.js | 4 ++ 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/src/app/controllers/main.php b/src/app/controllers/main.php index 29321d4..163d11e 100755 --- a/src/app/controllers/main.php +++ b/src/app/controllers/main.php @@ -2,39 +2,70 @@ /** * Main Controller - * The index method on this is the homepage + * The index method on this is the homepage. + * This is also a dynamic homepage that switches + * to explore on loggedout or dashboard + * on loggedin. * * @package Controllers */ class Main extends CI_Controller { + public $loggedin; + function __construct() { parent::__construct(); $this->load->model('post_model'); + $this->load->model('people_model'); + $this->load->model('comments_model'); + $this->loggedin = $this->php_session->get('loggedin'); } - /** - * This is the home page - */ public function index() { - // If user is logged in, redirect to dashboard - if($this->php_session->get('loggedin')) { - redirect('dashboard'); - } - else { - $data['title'] = 'Welcome'; - $data['stylesheets'] = array( - 'assets/css/home.css', - 'http://fonts.googleapis.com/css?family=Lato:700' - ); - $posts = $this->post_model->get_posts('explore', 0); - // Turn $posts array into HTML - $data['posts'] = $this->post_model->post_html($posts, true); - $data['feed'] = true; - $data['feed_container'] = '#layout'; - $this->template->load('home', $data); + switch ($this->loggedin) { + + case true: + // user is not logged in, explore page instead of dashboard. + $data['title'] = 'Explore'; + // load some stylesheets + $data['stylesheets'] = array( + 'assets/css/home.css', + 'http://fonts.googleapis.com/css?family=Lato:700' + ); + + $posts = $this->post_model->get_posts('explore', 0); + // Turn $posts array into HTML + $data['posts'] = $this->post_model->post_html($posts, true); + // tell the JS that there is a feed here + $data['feed'] = true; + // set a container for the feed + $data['feed_container'] = '#feed'; + $this->template->load('home', $data); + + break; + + case false: + + // user is not logged in, explore page instead of dashboard. + $data['title'] = 'Explore'; + // load some stylesheets + $data['stylesheets'] = array( + 'assets/css/home.css', + 'http://fonts.googleapis.com/css?family=Lato:700' + ); + + $posts = $this->post_model->get_posts('explore', 0); + // Turn $posts array into HTML + $data['posts'] = $this->post_model->post_html($posts, true); + // tell the JS that there is a feed here + $data['feed'] = true; + // set a container for the feed + $data['feed_container'] = '#feed'; + $this->template->load('home', $data); + break; + } } diff --git a/src/app/views/home.php b/src/app/views/home.php index 131ff82..e2ca75d 100644 --- a/src/app/views/home.php +++ b/src/app/views/home.php @@ -1,3 +1,3 @@ -
- +
+
\ No newline at end of file diff --git a/src/app/views/templates/master.php b/src/app/views/templates/master.php index f8d4970..4bc557d 100644 --- a/src/app/views/templates/master.php +++ b/src/app/views/templates/master.php @@ -8,7 +8,7 @@ load->view('navbar'); echo "\n"; ?> -load->view('templates/hero'); } ?> +php_session->get('loggedin')) { $this->load->view('templates/hero'); } ?> load->view('templates/no_script'); echo "\n"; ?> diff --git a/src/assets/js/dash.js b/src/assets/js/dash.js index ab6eb6b..f464247 100644 --- a/src/assets/js/dash.js +++ b/src/assets/js/dash.js @@ -16,6 +16,10 @@ var Dash = Dash || { init: function (elem, type) { Dash.feed_container = elem; + if($(window).height() >= $('#feed_measure').height()){ + Dash.feed.ajax.load_more(type); + } + $(window).scroll(function(){ if ($(window).scrollTop() == $(document).height() - $(window).height()){ Dash.feed.ajax.load_more(type); From 63f9127b8e1702c5fddbd24d498fe4c4376c4366 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 9 May 2015 21:30:24 -0400 Subject: [PATCH 9/9] Added ignored files --- .gitignore | 2 - src/app/config/{config.php => config.php.sm} | 0 src/app/config/database.php.sm | 69 ++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) rename src/app/config/{config.php => config.php.sm} (100%) create mode 100644 src/app/config/database.php.sm diff --git a/.gitignore b/.gitignore index bb9b8ee..bf1f1aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,3 @@ src/*/avatars src/*/avatars/* src/app/config/database.php src/src/app/config/config.php -src/app/config/database.php.sm -src/app/config/config.php.sm \ No newline at end of file diff --git a/src/app/config/config.php b/src/app/config/config.php.sm similarity index 100% rename from src/app/config/config.php rename to src/app/config/config.php.sm diff --git a/src/app/config/database.php.sm b/src/app/config/database.php.sm new file mode 100644 index 0000000..c8dbbf7 --- /dev/null +++ b/src/app/config/database.php.sm @@ -0,0 +1,69 @@ +