diff --git a/.gitignore b/.gitignore index 67ef85d9..c669bc09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ # Local Config -/public/include/config/global.inc.php -/public/include/config/security.inc.php +/include/config/global.inc.php +/include/config/security.inc.php # Templates -/public/templates/compile/*.php -/public/templates/compile/** -/public/templates/cache/*.php -/public/templates/cache/** +/templates/compile/*.php +/templates/compile/** +/templates/cache/*.php +/templates/cache/** # Logs /cronjobs/logs @@ -14,8 +14,8 @@ /logs/* # Test configs -public/include/config/global.inc.scrypt.php -public/include/config/global.inc.sha.php +/include/config/global.inc.scrypt.php +/include/config/global.inc.sha.php # IDE Settings /.idea/* diff --git a/.htaccess b/.htaccess index d71420f8..a176a76f 100644 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,10 @@ ErrorDocument 404 /public/index.php?page=error&action=404 RedirectMatch 404 /logs(/|$) -Options -Indexes \ No newline at end of file +RedirectMatch 404 /templtes(/|$) +RedirectMatch 404 /include(/|$) +RedirectMatch 404 /scripts(/|$) +RedirectMatch 404 /sql(/|$) +RedirectMatch 404 /upgrade(/|$) +RedirectMatch 404 /cronjobs(/|$) +RedirectMatch 404 /tests(/|$) +Options -Indexes diff --git a/cronjobs/logs/README.md b/cronjobs/logs/README.md deleted file mode 100644 index 864999fd..00000000 --- a/cronjobs/logs/README.md +++ /dev/null @@ -1 +0,0 @@ -Logging directory for cronjobs. diff --git a/cronjobs/shared.inc.php b/cronjobs/shared.inc.php index 2fb96531..f26e692b 100644 --- a/cronjobs/shared.inc.php +++ b/cronjobs/shared.inc.php @@ -35,7 +35,7 @@ if (SECHASH_CHECK) { // MODIFY THIS // We need to find our include files so set this properly -define("BASEPATH", "../public/"); +define("BASEPATH", dirname(__FILE__) . "/"); /***************************************************** * No need to change beyond this point * @@ -48,14 +48,8 @@ $dStartTime = microtime(true); $cron_name = basename($_SERVER['PHP_SELF'], '.php'); // Include our configuration (holding defines for the requires) -require_once(BASEPATH . 'include/config/global.inc.dist.php'); -require_once(BASEPATH . 'include/config/global.inc.php'); - -require_once(BASEPATH . 'include/config/security.inc.dist.php'); -@include_once(BASEPATH . 'include/config/security.inc.php'); - -require_once(BASEPATH . 'include/bootstrap.php'); -require_once(BASEPATH . 'include/version.inc.php'); +require_once(BASEPATH . '../include/bootstrap.php'); +require_once(BASEPATH . '../include/version.inc.php'); // Command line switches array_shift($argv); @@ -69,7 +63,7 @@ foreach ($argv as $option) { } // Load 3rd party logging library for running crons -$log = KLogger::instance( 'logs/' . $cron_name, KLogger::INFO ); +$log = KLogger::instance( BASEPATH . '../logs/' . $cron_name, KLogger::INFO ); $log->LogDebug('Starting ' . $cron_name); // Load the start time for later runtime calculations for monitoring diff --git a/public/include/admin_checks.php b/include/admin_checks.php similarity index 98% rename from public/include/admin_checks.php rename to include/admin_checks.php index 179d873a..4ae439a7 100644 --- a/public/include/admin_checks.php +++ b/include/admin_checks.php @@ -53,10 +53,10 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][ } // check if we can write templates/cache and templates/compile -> error - if (!is_writable(THEME_DIR.'/cache')) { + if (!is_writable(TEMPLATE_DIR . '/cache')) { $error[] = "templates/cache folder is not writable for uid {$apache_user['name']}"; } - if (!is_writable(THEME_DIR.'/compile')) { + if (!is_writable(TEMPLATE_DIR . '/compile')) { $error[] = "templates/compile folder is not writable for uid {$apache_user['name']}"; } diff --git a/public/include/autoloader.inc.php b/include/autoloader.inc.php similarity index 100% rename from public/include/autoloader.inc.php rename to include/autoloader.inc.php diff --git a/public/include/bootstrap.php b/include/bootstrap.php similarity index 68% rename from public/include/bootstrap.php rename to include/bootstrap.php index 241fccca..0e286a53 100644 --- a/public/include/bootstrap.php +++ b/include/bootstrap.php @@ -3,20 +3,20 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; // Used for performance calculations $dStartTime = microtime(true); -define('INCLUDE_DIR', BASEPATH . 'include'); +define('INCLUDE_DIR', BASEPATH . '../include'); define('CLASS_DIR', INCLUDE_DIR . '/classes'); define('PAGES_DIR', INCLUDE_DIR . '/pages'); -define('THEME_DIR', BASEPATH . 'templates'); +define('TEMPLATE_DIR', BASEPATH . '../templates'); $quickstartlink = "Quick Start Guide"; // Include our configuration (holding defines for the requires) -if (!include_once(BASEPATH . 'include/config/global.inc.dist.php')) die('Unable to load base global config from ['.BASEPATH . 'include/config/global.inc.dist.php' . '] - '.$quickstartlink); -if (!@include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load your global config from ['.BASEPATH . 'include/config/global.inc.php' . '] - '.$quickstartlink); +if (!include_once(INCLUDE_DIR . '/config/global.inc.dist.php')) die('Unable to load base global config from ['.INCLUDE_DIR. '/config/global.inc.dist.php' . '] - '.$quickstartlink); +if (!@include_once(INCLUDE_DIR . '/config/global.inc.php')) die('Unable to load your global config from ['.INCLUDE_DIR. '/config/global.inc.php' . '] - '.$quickstartlink); // load our security configs -if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unable to load base security config from ['.BASEPATH . 'include/config/security.inc.dist.php' . '] - '.$quickstartlink); -if (@file_exists(BASEPATH . 'include/config/security.inc.php')) include_once(BASEPATH . 'include/config/security.inc.php'); +if (!include_once(INCLUDE_DIR . '/config/security.inc.dist.php')) die('Unable to load base security config from ['.INCLUDE_DIR. '/config/security.inc.dist.php' . '] - '.$quickstartlink); +if (@file_exists(INCLUDE_DIR . '/config/security.inc.php')) include_once(INCLUDE_DIR . '/config/security.inc.php'); // start our session, we need it for smarty caching session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']); diff --git a/public/include/classes/api.class.php b/include/classes/api.class.php similarity index 100% rename from public/include/classes/api.class.php rename to include/classes/api.class.php diff --git a/public/include/classes/base.class.php b/include/classes/base.class.php similarity index 100% rename from public/include/classes/base.class.php rename to include/classes/base.class.php diff --git a/public/include/classes/bitcoin.class.php b/include/classes/bitcoin.class.php similarity index 100% rename from public/include/classes/bitcoin.class.php rename to include/classes/bitcoin.class.php diff --git a/public/include/classes/bitcoinwrapper.class.php b/include/classes/bitcoinwrapper.class.php similarity index 100% rename from public/include/classes/bitcoinwrapper.class.php rename to include/classes/bitcoinwrapper.class.php diff --git a/public/include/classes/block.class.php b/include/classes/block.class.php similarity index 100% rename from public/include/classes/block.class.php rename to include/classes/block.class.php diff --git a/public/include/classes/coins/coin_base.class.php b/include/classes/coins/coin_base.class.php similarity index 100% rename from public/include/classes/coins/coin_base.class.php rename to include/classes/coins/coin_base.class.php diff --git a/public/include/classes/coins/coin_scrypt.class.php b/include/classes/coins/coin_scrypt.class.php similarity index 100% rename from public/include/classes/coins/coin_scrypt.class.php rename to include/classes/coins/coin_scrypt.class.php diff --git a/public/include/classes/coins/coin_sha256d.class.php b/include/classes/coins/coin_sha256d.class.php similarity index 100% rename from public/include/classes/coins/coin_sha256d.class.php rename to include/classes/coins/coin_sha256d.class.php diff --git a/public/include/classes/csrftoken.class.php b/include/classes/csrftoken.class.php similarity index 100% rename from public/include/classes/csrftoken.class.php rename to include/classes/csrftoken.class.php diff --git a/public/include/classes/debug.class.php b/include/classes/debug.class.php similarity index 100% rename from public/include/classes/debug.class.php rename to include/classes/debug.class.php diff --git a/public/include/classes/invitation.class.php b/include/classes/invitation.class.php similarity index 100% rename from public/include/classes/invitation.class.php rename to include/classes/invitation.class.php diff --git a/public/include/classes/logger.class.php b/include/classes/logger.class.php similarity index 97% rename from public/include/classes/logger.class.php rename to include/classes/logger.class.php index eb7b30e5..0283798d 100644 --- a/public/include/classes/logger.class.php +++ b/include/classes/logger.class.php @@ -5,7 +5,7 @@ class Logger { private $logging = false; public function __construct($config) { if ($config['logging']['enabled'] && $config['logging']['level'] > 0) { - $this->KLogger = KLogger::instance($config['logging']['path'], $config['logging']['level']); + $this->KLogger = KLogger::instance($config['logging']['path'] . '/website', $config['logging']['level']); $this->logging = true; $this->floatStartTime = microtime(true); } diff --git a/public/include/classes/mail.class.php b/include/classes/mail.class.php similarity index 93% rename from public/include/classes/mail.class.php rename to include/classes/mail.class.php index d3375402..a60359bd 100644 --- a/public/include/classes/mail.class.php +++ b/include/classes/mail.class.php @@ -74,8 +74,8 @@ class Mail extends Base { } // Prepare the smarty templates used - $this->smarty->clearCache(BASEPATH . 'templates/mail/' . $template . '.tpl'); - $this->smarty->clearCache(BASEPATH . 'templates/mail/subject.tpl'); + $this->smarty->clearCache(TEMPLATE_DIR . '/mail/' . $template . '.tpl'); + $this->smarty->clearCache(TEMPLATE_DIR . '/mail/subject.tpl'); $this->smarty->assign('WEBSITENAME', $this->setting->getValue('website_name')); $this->smarty->assign('SUBJECT', $aData['subject']); $this->smarty->assign('DATA', $aData); @@ -84,12 +84,12 @@ class Mail extends Base { $senderEmail = $this->setting->getValue('website_email', 'test@example.com'); $senderName = $this->setting->getValue('website_name', 'test@example.com'); $message = Swift_Message::newInstance() - ->setSubject($this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl')) + ->setSubject($this->smarty->fetch(TEMPLATE_DIR . '/mail/subject.tpl')) ->setFrom(array( $senderEmail => $senderName)) ->setTo($aData['email']) ->setSender($senderEmail) ->setReturnPath($senderEmail) - ->setBody($this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), 'text/html'); + ->setBody($this->smarty->fetch(TEMPLATE_DIR . '/mail/' . $template . '.tpl'), 'text/html'); if (isset($aData['senderName']) && isset($aData['senderEmail']) && strlen($aData['senderName']) > 0 && diff --git a/public/include/classes/memcache_ad.class.php b/include/classes/memcache_ad.class.php similarity index 100% rename from public/include/classes/memcache_ad.class.php rename to include/classes/memcache_ad.class.php diff --git a/public/include/classes/memcached.class.php b/include/classes/memcached.class.php similarity index 100% rename from public/include/classes/memcached.class.php rename to include/classes/memcached.class.php diff --git a/public/include/classes/monitoring.class.php b/include/classes/monitoring.class.php similarity index 100% rename from public/include/classes/monitoring.class.php rename to include/classes/monitoring.class.php diff --git a/public/include/classes/news.class.php b/include/classes/news.class.php similarity index 100% rename from public/include/classes/news.class.php rename to include/classes/news.class.php diff --git a/public/include/classes/notification.class.php b/include/classes/notification.class.php similarity index 100% rename from public/include/classes/notification.class.php rename to include/classes/notification.class.php diff --git a/public/include/classes/payout.class.php b/include/classes/payout.class.php similarity index 100% rename from public/include/classes/payout.class.php rename to include/classes/payout.class.php diff --git a/public/include/classes/roundstats.class.php b/include/classes/roundstats.class.php similarity index 100% rename from public/include/classes/roundstats.class.php rename to include/classes/roundstats.class.php diff --git a/public/include/classes/setting.class.php b/include/classes/setting.class.php similarity index 100% rename from public/include/classes/setting.class.php rename to include/classes/setting.class.php diff --git a/public/include/classes/share.class.php b/include/classes/share.class.php similarity index 100% rename from public/include/classes/share.class.php rename to include/classes/share.class.php diff --git a/public/include/classes/statistics.class.php b/include/classes/statistics.class.php similarity index 100% rename from public/include/classes/statistics.class.php rename to include/classes/statistics.class.php diff --git a/public/include/classes/statscache.class.php b/include/classes/statscache.class.php similarity index 100% rename from public/include/classes/statscache.class.php rename to include/classes/statscache.class.php diff --git a/public/include/classes/strict.class.php b/include/classes/strict.class.php similarity index 100% rename from public/include/classes/strict.class.php rename to include/classes/strict.class.php diff --git a/public/include/classes/template.class.php b/include/classes/template.class.php similarity index 95% rename from public/include/classes/template.class.php rename to include/classes/template.class.php index fd0eea58..dac32fdd 100644 --- a/public/include/classes/template.class.php +++ b/include/classes/template.class.php @@ -17,13 +17,13 @@ class Template extends Base { /** * Get all available themes - * Read theme folders from THEME_DIR + * Read theme folders from TEMPLATE_DIR * * @return array - list of available themes */ public function getThemes() { $this->debug->append("STA " . __METHOD__, 4); - $aTmpThemes = glob(THEME_DIR . '/*'); + $aTmpThemes = glob(TEMPLATE_DIR . '/*'); $aThemes = array(); foreach ($aTmpThemes as $dir) { if (basename($dir) != 'cache' && basename($dir) != 'compile' && basename($dir) != 'mail') $aThemes[basename($dir)] = basename($dir); @@ -86,12 +86,12 @@ class Template extends Base { /** * Return the content of specific template file * - * @param $file - file of template related to THEME_DIR + * @param $file - file of template related to TEMPLATE_DIR * @return string - content of the template file */ public function getTemplateContent($file) { $this->debug->append("STA " . __METHOD__, 4); - $filepath = THEME_DIR . '/' . $file; + $filepath = TEMPLATE_DIR . '/' . $file; return file_get_contents($filepath); } @@ -103,7 +103,7 @@ class Template extends Base { */ public function getTemplateFiles($theme) { $this->debug->append("STA " . __METHOD__, 4); - $folder = THEME_DIR . '/' . $theme; + $folder = TEMPLATE_DIR . '/' . $theme; $dir = new RecursiveDirectoryIterator($folder); $ite = new RecursiveIteratorIterator($dir); @@ -130,7 +130,7 @@ class Template extends Base { $templates = array(); foreach($themes as $theme) { - $templates[$theme] = $this->_getTemplatesTreeRecursive(THEME_DIR . '/' . $theme); + $templates[$theme] = $this->_getTemplatesTreeRecursive(TEMPLATE_DIR . '/' . $theme); } return $templates; diff --git a/public/include/classes/token.class.php b/include/classes/token.class.php similarity index 100% rename from public/include/classes/token.class.php rename to include/classes/token.class.php diff --git a/public/include/classes/tokentype.class.php b/include/classes/tokentype.class.php similarity index 100% rename from public/include/classes/tokentype.class.php rename to include/classes/tokentype.class.php diff --git a/public/include/classes/tools.class.php b/include/classes/tools.class.php similarity index 100% rename from public/include/classes/tools.class.php rename to include/classes/tools.class.php diff --git a/public/include/classes/transaction.class.php b/include/classes/transaction.class.php similarity index 100% rename from public/include/classes/transaction.class.php rename to include/classes/transaction.class.php diff --git a/public/include/classes/user.class.php b/include/classes/user.class.php similarity index 100% rename from public/include/classes/user.class.php rename to include/classes/user.class.php diff --git a/public/include/classes/worker.class.php b/include/classes/worker.class.php similarity index 100% rename from public/include/classes/worker.class.php rename to include/classes/worker.class.php diff --git a/public/include/config/admin_settings.inc.php b/include/config/admin_settings.inc.php similarity index 100% rename from public/include/config/admin_settings.inc.php rename to include/config/admin_settings.inc.php diff --git a/public/include/config/error_codes.inc.php b/include/config/error_codes.inc.php similarity index 100% rename from public/include/config/error_codes.inc.php rename to include/config/error_codes.inc.php diff --git a/public/include/config/global.inc.dist.php b/include/config/global.inc.dist.php similarity index 100% rename from public/include/config/global.inc.dist.php rename to include/config/global.inc.dist.php diff --git a/public/include/config/memcache_keys.inc.php b/include/config/memcache_keys.inc.php similarity index 100% rename from public/include/config/memcache_keys.inc.php rename to include/config/memcache_keys.inc.php diff --git a/public/include/config/monitor_crons.inc.php b/include/config/monitor_crons.inc.php similarity index 100% rename from public/include/config/monitor_crons.inc.php rename to include/config/monitor_crons.inc.php diff --git a/public/include/config/security.inc.dist.php b/include/config/security.inc.dist.php similarity index 100% rename from public/include/config/security.inc.dist.php rename to include/config/security.inc.dist.php diff --git a/public/include/database.inc.php b/include/database.inc.php similarity index 100% rename from public/include/database.inc.php rename to include/database.inc.php diff --git a/public/include/lib/KLogger.php b/include/lib/KLogger.php similarity index 100% rename from public/include/lib/KLogger.php rename to include/lib/KLogger.php diff --git a/public/include/lib/Michelf/Markdown.php b/include/lib/Michelf/Markdown.php similarity index 100% rename from public/include/lib/Michelf/Markdown.php rename to include/lib/Michelf/Markdown.php diff --git a/public/include/lib/Michelf/MarkdownExtra.php b/include/lib/Michelf/MarkdownExtra.php similarity index 100% rename from public/include/lib/Michelf/MarkdownExtra.php rename to include/lib/Michelf/MarkdownExtra.php diff --git a/public/include/lib/jsonRPCClient.php b/include/lib/jsonRPCClient.php similarity index 100% rename from public/include/lib/jsonRPCClient.php rename to include/lib/jsonRPCClient.php diff --git a/public/include/lib/recaptchalib.php b/include/lib/recaptchalib.php similarity index 100% rename from public/include/lib/recaptchalib.php rename to include/lib/recaptchalib.php diff --git a/public/include/lib/scrypt.php b/include/lib/scrypt.php similarity index 100% rename from public/include/lib/scrypt.php rename to include/lib/scrypt.php diff --git a/public/include/lib/smarty_plugins/function.acl.php b/include/lib/smarty_plugins/function.acl.php similarity index 100% rename from public/include/lib/smarty_plugins/function.acl.php rename to include/lib/smarty_plugins/function.acl.php diff --git a/public/include/lib/swiftmailer/classes/Swift.php b/include/lib/swiftmailer/classes/Swift.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift.php rename to include/lib/swiftmailer/classes/Swift.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Attachment.php b/include/lib/swiftmailer/classes/Swift/Attachment.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Attachment.php rename to include/lib/swiftmailer/classes/Swift/Attachment.php diff --git a/public/include/lib/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/include/lib/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php rename to include/lib/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php b/include/lib/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php rename to include/lib/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/ByteStream/FileByteStream.php b/include/lib/swiftmailer/classes/Swift/ByteStream/FileByteStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/ByteStream/FileByteStream.php rename to include/lib/swiftmailer/classes/Swift/ByteStream/FileByteStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/ByteStream/TemporaryFileByteStream.php b/include/lib/swiftmailer/classes/Swift/ByteStream/TemporaryFileByteStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/ByteStream/TemporaryFileByteStream.php rename to include/lib/swiftmailer/classes/Swift/ByteStream/TemporaryFileByteStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterReader.php b/include/lib/swiftmailer/classes/Swift/CharacterReader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterReader.php rename to include/lib/swiftmailer/classes/Swift/CharacterReader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/include/lib/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php rename to include/lib/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php b/include/lib/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php rename to include/lib/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php b/include/lib/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php rename to include/lib/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterReaderFactory.php b/include/lib/swiftmailer/classes/Swift/CharacterReaderFactory.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterReaderFactory.php rename to include/lib/swiftmailer/classes/Swift/CharacterReaderFactory.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/include/lib/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php rename to include/lib/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterStream.php b/include/lib/swiftmailer/classes/Swift/CharacterStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterStream.php rename to include/lib/swiftmailer/classes/Swift/CharacterStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php b/include/lib/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php rename to include/lib/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php b/include/lib/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php rename to include/lib/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/ConfigurableSpool.php b/include/lib/swiftmailer/classes/Swift/ConfigurableSpool.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/ConfigurableSpool.php rename to include/lib/swiftmailer/classes/Swift/ConfigurableSpool.php diff --git a/public/include/lib/swiftmailer/classes/Swift/DependencyContainer.php b/include/lib/swiftmailer/classes/Swift/DependencyContainer.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/DependencyContainer.php rename to include/lib/swiftmailer/classes/Swift/DependencyContainer.php diff --git a/public/include/lib/swiftmailer/classes/Swift/DependencyException.php b/include/lib/swiftmailer/classes/Swift/DependencyException.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/DependencyException.php rename to include/lib/swiftmailer/classes/Swift/DependencyException.php diff --git a/public/include/lib/swiftmailer/classes/Swift/EmbeddedFile.php b/include/lib/swiftmailer/classes/Swift/EmbeddedFile.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/EmbeddedFile.php rename to include/lib/swiftmailer/classes/Swift/EmbeddedFile.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Encoder.php b/include/lib/swiftmailer/classes/Swift/Encoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Encoder.php rename to include/lib/swiftmailer/classes/Swift/Encoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Encoder/Base64Encoder.php b/include/lib/swiftmailer/classes/Swift/Encoder/Base64Encoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Encoder/Base64Encoder.php rename to include/lib/swiftmailer/classes/Swift/Encoder/Base64Encoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Encoder/QpEncoder.php b/include/lib/swiftmailer/classes/Swift/Encoder/QpEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Encoder/QpEncoder.php rename to include/lib/swiftmailer/classes/Swift/Encoder/QpEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php b/include/lib/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php rename to include/lib/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Encoding.php b/include/lib/swiftmailer/classes/Swift/Encoding.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Encoding.php rename to include/lib/swiftmailer/classes/Swift/Encoding.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/CommandEvent.php b/include/lib/swiftmailer/classes/Swift/Events/CommandEvent.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/CommandEvent.php rename to include/lib/swiftmailer/classes/Swift/Events/CommandEvent.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/CommandListener.php b/include/lib/swiftmailer/classes/Swift/Events/CommandListener.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/CommandListener.php rename to include/lib/swiftmailer/classes/Swift/Events/CommandListener.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/Event.php b/include/lib/swiftmailer/classes/Swift/Events/Event.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/Event.php rename to include/lib/swiftmailer/classes/Swift/Events/Event.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/EventDispatcher.php b/include/lib/swiftmailer/classes/Swift/Events/EventDispatcher.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/EventDispatcher.php rename to include/lib/swiftmailer/classes/Swift/Events/EventDispatcher.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/EventListener.php b/include/lib/swiftmailer/classes/Swift/Events/EventListener.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/EventListener.php rename to include/lib/swiftmailer/classes/Swift/Events/EventListener.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/EventObject.php b/include/lib/swiftmailer/classes/Swift/Events/EventObject.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/EventObject.php rename to include/lib/swiftmailer/classes/Swift/Events/EventObject.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/ResponseEvent.php b/include/lib/swiftmailer/classes/Swift/Events/ResponseEvent.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/ResponseEvent.php rename to include/lib/swiftmailer/classes/Swift/Events/ResponseEvent.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/ResponseListener.php b/include/lib/swiftmailer/classes/Swift/Events/ResponseListener.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/ResponseListener.php rename to include/lib/swiftmailer/classes/Swift/Events/ResponseListener.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/SendEvent.php b/include/lib/swiftmailer/classes/Swift/Events/SendEvent.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/SendEvent.php rename to include/lib/swiftmailer/classes/Swift/Events/SendEvent.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/SendListener.php b/include/lib/swiftmailer/classes/Swift/Events/SendListener.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/SendListener.php rename to include/lib/swiftmailer/classes/Swift/Events/SendListener.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php b/include/lib/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php rename to include/lib/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/TransportChangeEvent.php b/include/lib/swiftmailer/classes/Swift/Events/TransportChangeEvent.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/TransportChangeEvent.php rename to include/lib/swiftmailer/classes/Swift/Events/TransportChangeEvent.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/TransportChangeListener.php b/include/lib/swiftmailer/classes/Swift/Events/TransportChangeListener.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/TransportChangeListener.php rename to include/lib/swiftmailer/classes/Swift/Events/TransportChangeListener.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php b/include/lib/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php rename to include/lib/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Events/TransportExceptionListener.php b/include/lib/swiftmailer/classes/Swift/Events/TransportExceptionListener.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Events/TransportExceptionListener.php rename to include/lib/swiftmailer/classes/Swift/Events/TransportExceptionListener.php diff --git a/public/include/lib/swiftmailer/classes/Swift/FailoverTransport.php b/include/lib/swiftmailer/classes/Swift/FailoverTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/FailoverTransport.php rename to include/lib/swiftmailer/classes/Swift/FailoverTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/FileSpool.php b/include/lib/swiftmailer/classes/Swift/FileSpool.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/FileSpool.php rename to include/lib/swiftmailer/classes/Swift/FileSpool.php diff --git a/public/include/lib/swiftmailer/classes/Swift/FileStream.php b/include/lib/swiftmailer/classes/Swift/FileStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/FileStream.php rename to include/lib/swiftmailer/classes/Swift/FileStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Filterable.php b/include/lib/swiftmailer/classes/Swift/Filterable.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Filterable.php rename to include/lib/swiftmailer/classes/Swift/Filterable.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Image.php b/include/lib/swiftmailer/classes/Swift/Image.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Image.php rename to include/lib/swiftmailer/classes/Swift/Image.php diff --git a/public/include/lib/swiftmailer/classes/Swift/InputByteStream.php b/include/lib/swiftmailer/classes/Swift/InputByteStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/InputByteStream.php rename to include/lib/swiftmailer/classes/Swift/InputByteStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/IoException.php b/include/lib/swiftmailer/classes/Swift/IoException.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/IoException.php rename to include/lib/swiftmailer/classes/Swift/IoException.php diff --git a/public/include/lib/swiftmailer/classes/Swift/KeyCache.php b/include/lib/swiftmailer/classes/Swift/KeyCache.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/KeyCache.php rename to include/lib/swiftmailer/classes/Swift/KeyCache.php diff --git a/public/include/lib/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php b/include/lib/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php rename to include/lib/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php diff --git a/public/include/lib/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php b/include/lib/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php rename to include/lib/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php diff --git a/public/include/lib/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php b/include/lib/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php rename to include/lib/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php b/include/lib/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php rename to include/lib/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php diff --git a/public/include/lib/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/include/lib/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php rename to include/lib/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/LoadBalancedTransport.php b/include/lib/swiftmailer/classes/Swift/LoadBalancedTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/LoadBalancedTransport.php rename to include/lib/swiftmailer/classes/Swift/LoadBalancedTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/MailTransport.php b/include/lib/swiftmailer/classes/Swift/MailTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/MailTransport.php rename to include/lib/swiftmailer/classes/Swift/MailTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mailer.php b/include/lib/swiftmailer/classes/Swift/Mailer.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mailer.php rename to include/lib/swiftmailer/classes/Swift/Mailer.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php b/include/lib/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php rename to include/lib/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mailer/RecipientIterator.php b/include/lib/swiftmailer/classes/Swift/Mailer/RecipientIterator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mailer/RecipientIterator.php rename to include/lib/swiftmailer/classes/Swift/Mailer/RecipientIterator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/MemorySpool.php b/include/lib/swiftmailer/classes/Swift/MemorySpool.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/MemorySpool.php rename to include/lib/swiftmailer/classes/Swift/MemorySpool.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Message.php b/include/lib/swiftmailer/classes/Swift/Message.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Message.php rename to include/lib/swiftmailer/classes/Swift/Message.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Attachment.php b/include/lib/swiftmailer/classes/Swift/Mime/Attachment.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Attachment.php rename to include/lib/swiftmailer/classes/Swift/Mime/Attachment.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/CharsetObserver.php b/include/lib/swiftmailer/classes/Swift/Mime/CharsetObserver.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/CharsetObserver.php rename to include/lib/swiftmailer/classes/Swift/Mime/CharsetObserver.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/EmbeddedFile.php b/include/lib/swiftmailer/classes/Swift/Mime/EmbeddedFile.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/EmbeddedFile.php rename to include/lib/swiftmailer/classes/Swift/Mime/EmbeddedFile.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/EncodingObserver.php b/include/lib/swiftmailer/classes/Swift/Mime/EncodingObserver.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/EncodingObserver.php rename to include/lib/swiftmailer/classes/Swift/Mime/EncodingObserver.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Grammar.php b/include/lib/swiftmailer/classes/Swift/Mime/Grammar.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Grammar.php rename to include/lib/swiftmailer/classes/Swift/Mime/Grammar.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Header.php b/include/lib/swiftmailer/classes/Swift/Mime/Header.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Header.php rename to include/lib/swiftmailer/classes/Swift/Mime/Header.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php rename to include/lib/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/HeaderFactory.php b/include/lib/swiftmailer/classes/Swift/Mime/HeaderFactory.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/HeaderFactory.php rename to include/lib/swiftmailer/classes/Swift/Mime/HeaderFactory.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/HeaderSet.php b/include/lib/swiftmailer/classes/Swift/Mime/HeaderSet.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/HeaderSet.php rename to include/lib/swiftmailer/classes/Swift/Mime/HeaderSet.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/OpenDKIMHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/OpenDKIMHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/OpenDKIMHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/Message.php b/include/lib/swiftmailer/classes/Swift/Mime/Message.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/Message.php rename to include/lib/swiftmailer/classes/Swift/Mime/Message.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/MimeEntity.php b/include/lib/swiftmailer/classes/Swift/Mime/MimeEntity.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/MimeEntity.php rename to include/lib/swiftmailer/classes/Swift/Mime/MimeEntity.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/MimePart.php b/include/lib/swiftmailer/classes/Swift/Mime/MimePart.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/MimePart.php rename to include/lib/swiftmailer/classes/Swift/Mime/MimePart.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php b/include/lib/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php rename to include/lib/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php b/include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php rename to include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php b/include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php rename to include/lib/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/SimpleMessage.php b/include/lib/swiftmailer/classes/Swift/Mime/SimpleMessage.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/SimpleMessage.php rename to include/lib/swiftmailer/classes/Swift/Mime/SimpleMessage.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php b/include/lib/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php rename to include/lib/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php diff --git a/public/include/lib/swiftmailer/classes/Swift/MimePart.php b/include/lib/swiftmailer/classes/Swift/MimePart.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/MimePart.php rename to include/lib/swiftmailer/classes/Swift/MimePart.php diff --git a/public/include/lib/swiftmailer/classes/Swift/NullTransport.php b/include/lib/swiftmailer/classes/Swift/NullTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/NullTransport.php rename to include/lib/swiftmailer/classes/Swift/NullTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/OutputByteStream.php b/include/lib/swiftmailer/classes/Swift/OutputByteStream.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/OutputByteStream.php rename to include/lib/swiftmailer/classes/Swift/OutputByteStream.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php b/include/lib/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/ImpersonatePlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/ImpersonatePlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/ImpersonatePlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/ImpersonatePlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Logger.php b/include/lib/swiftmailer/classes/Swift/Plugins/Logger.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Logger.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Logger.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php b/include/lib/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php b/include/lib/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/MessageLogger.php b/include/lib/swiftmailer/classes/Swift/Plugins/MessageLogger.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/MessageLogger.php rename to include/lib/swiftmailer/classes/Swift/Plugins/MessageLogger.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php b/include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php b/include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Reporter.php b/include/lib/swiftmailer/classes/Swift/Plugins/Reporter.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Reporter.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Reporter.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php b/include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php b/include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Sleeper.php b/include/lib/swiftmailer/classes/Swift/Plugins/Sleeper.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Sleeper.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Sleeper.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php b/include/lib/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php rename to include/lib/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Plugins/Timer.php b/include/lib/swiftmailer/classes/Swift/Plugins/Timer.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Plugins/Timer.php rename to include/lib/swiftmailer/classes/Swift/Plugins/Timer.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Preferences.php b/include/lib/swiftmailer/classes/Swift/Preferences.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Preferences.php rename to include/lib/swiftmailer/classes/Swift/Preferences.php diff --git a/public/include/lib/swiftmailer/classes/Swift/ReplacementFilterFactory.php b/include/lib/swiftmailer/classes/Swift/ReplacementFilterFactory.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/ReplacementFilterFactory.php rename to include/lib/swiftmailer/classes/Swift/ReplacementFilterFactory.php diff --git a/public/include/lib/swiftmailer/classes/Swift/RfcComplianceException.php b/include/lib/swiftmailer/classes/Swift/RfcComplianceException.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/RfcComplianceException.php rename to include/lib/swiftmailer/classes/Swift/RfcComplianceException.php diff --git a/public/include/lib/swiftmailer/classes/Swift/SendmailTransport.php b/include/lib/swiftmailer/classes/Swift/SendmailTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/SendmailTransport.php rename to include/lib/swiftmailer/classes/Swift/SendmailTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/SignedMessage.php b/include/lib/swiftmailer/classes/Swift/SignedMessage.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/SignedMessage.php rename to include/lib/swiftmailer/classes/Swift/SignedMessage.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signer.php b/include/lib/swiftmailer/classes/Swift/Signer.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signer.php rename to include/lib/swiftmailer/classes/Swift/Signer.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signers/BodySigner.php b/include/lib/swiftmailer/classes/Swift/Signers/BodySigner.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signers/BodySigner.php rename to include/lib/swiftmailer/classes/Swift/Signers/BodySigner.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signers/DKIMSigner.php b/include/lib/swiftmailer/classes/Swift/Signers/DKIMSigner.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signers/DKIMSigner.php rename to include/lib/swiftmailer/classes/Swift/Signers/DKIMSigner.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signers/DomainKeySigner.php b/include/lib/swiftmailer/classes/Swift/Signers/DomainKeySigner.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signers/DomainKeySigner.php rename to include/lib/swiftmailer/classes/Swift/Signers/DomainKeySigner.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signers/HeaderSigner.php b/include/lib/swiftmailer/classes/Swift/Signers/HeaderSigner.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signers/HeaderSigner.php rename to include/lib/swiftmailer/classes/Swift/Signers/HeaderSigner.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signers/OpenDKIMSigner.php b/include/lib/swiftmailer/classes/Swift/Signers/OpenDKIMSigner.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signers/OpenDKIMSigner.php rename to include/lib/swiftmailer/classes/Swift/Signers/OpenDKIMSigner.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Signers/SMimeSigner.php b/include/lib/swiftmailer/classes/Swift/Signers/SMimeSigner.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Signers/SMimeSigner.php rename to include/lib/swiftmailer/classes/Swift/Signers/SMimeSigner.php diff --git a/public/include/lib/swiftmailer/classes/Swift/SmtpTransport.php b/include/lib/swiftmailer/classes/Swift/SmtpTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/SmtpTransport.php rename to include/lib/swiftmailer/classes/Swift/SmtpTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Spool.php b/include/lib/swiftmailer/classes/Swift/Spool.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Spool.php rename to include/lib/swiftmailer/classes/Swift/Spool.php diff --git a/public/include/lib/swiftmailer/classes/Swift/SpoolTransport.php b/include/lib/swiftmailer/classes/Swift/SpoolTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/SpoolTransport.php rename to include/lib/swiftmailer/classes/Swift/SpoolTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/StreamFilter.php b/include/lib/swiftmailer/classes/Swift/StreamFilter.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/StreamFilter.php rename to include/lib/swiftmailer/classes/Swift/StreamFilter.php diff --git a/public/include/lib/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/include/lib/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php rename to include/lib/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php diff --git a/public/include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php b/include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php rename to include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php diff --git a/public/include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php rename to include/lib/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php diff --git a/public/include/lib/swiftmailer/classes/Swift/SwiftException.php b/include/lib/swiftmailer/classes/Swift/SwiftException.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/SwiftException.php rename to include/lib/swiftmailer/classes/Swift/SwiftException.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport.php b/include/lib/swiftmailer/classes/Swift/Transport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport.php rename to include/lib/swiftmailer/classes/Swift/Transport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php b/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php rename to include/lib/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/EsmtpHandler.php b/include/lib/swiftmailer/classes/Swift/Transport/EsmtpHandler.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/EsmtpHandler.php rename to include/lib/swiftmailer/classes/Swift/Transport/EsmtpHandler.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/EsmtpTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/EsmtpTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/EsmtpTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/EsmtpTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/FailoverTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/FailoverTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/FailoverTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/FailoverTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/IoBuffer.php b/include/lib/swiftmailer/classes/Swift/Transport/IoBuffer.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/IoBuffer.php rename to include/lib/swiftmailer/classes/Swift/Transport/IoBuffer.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/MailInvoker.php b/include/lib/swiftmailer/classes/Swift/Transport/MailInvoker.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/MailInvoker.php rename to include/lib/swiftmailer/classes/Swift/Transport/MailInvoker.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/MailTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/MailTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/MailTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/MailTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/NullTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/NullTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/NullTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/NullTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/SendmailTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/SendmailTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/SendmailTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/SendmailTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php b/include/lib/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php rename to include/lib/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/SmtpAgent.php b/include/lib/swiftmailer/classes/Swift/Transport/SmtpAgent.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/SmtpAgent.php rename to include/lib/swiftmailer/classes/Swift/Transport/SmtpAgent.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/SpoolTransport.php b/include/lib/swiftmailer/classes/Swift/Transport/SpoolTransport.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/SpoolTransport.php rename to include/lib/swiftmailer/classes/Swift/Transport/SpoolTransport.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Transport/StreamBuffer.php b/include/lib/swiftmailer/classes/Swift/Transport/StreamBuffer.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Transport/StreamBuffer.php rename to include/lib/swiftmailer/classes/Swift/Transport/StreamBuffer.php diff --git a/public/include/lib/swiftmailer/classes/Swift/TransportException.php b/include/lib/swiftmailer/classes/Swift/TransportException.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/TransportException.php rename to include/lib/swiftmailer/classes/Swift/TransportException.php diff --git a/public/include/lib/swiftmailer/classes/Swift/Validate.php b/include/lib/swiftmailer/classes/Swift/Validate.php similarity index 100% rename from public/include/lib/swiftmailer/classes/Swift/Validate.php rename to include/lib/swiftmailer/classes/Swift/Validate.php diff --git a/public/include/lib/swiftmailer/dependency_maps/cache_deps.php b/include/lib/swiftmailer/dependency_maps/cache_deps.php similarity index 100% rename from public/include/lib/swiftmailer/dependency_maps/cache_deps.php rename to include/lib/swiftmailer/dependency_maps/cache_deps.php diff --git a/public/include/lib/swiftmailer/dependency_maps/message_deps.php b/include/lib/swiftmailer/dependency_maps/message_deps.php similarity index 100% rename from public/include/lib/swiftmailer/dependency_maps/message_deps.php rename to include/lib/swiftmailer/dependency_maps/message_deps.php diff --git a/public/include/lib/swiftmailer/dependency_maps/mime_deps.php b/include/lib/swiftmailer/dependency_maps/mime_deps.php similarity index 100% rename from public/include/lib/swiftmailer/dependency_maps/mime_deps.php rename to include/lib/swiftmailer/dependency_maps/mime_deps.php diff --git a/public/include/lib/swiftmailer/dependency_maps/transport_deps.php b/include/lib/swiftmailer/dependency_maps/transport_deps.php similarity index 100% rename from public/include/lib/swiftmailer/dependency_maps/transport_deps.php rename to include/lib/swiftmailer/dependency_maps/transport_deps.php diff --git a/public/include/lib/swiftmailer/mime_types.php b/include/lib/swiftmailer/mime_types.php similarity index 100% rename from public/include/lib/swiftmailer/mime_types.php rename to include/lib/swiftmailer/mime_types.php diff --git a/public/include/lib/swiftmailer/preferences.php b/include/lib/swiftmailer/preferences.php similarity index 100% rename from public/include/lib/swiftmailer/preferences.php rename to include/lib/swiftmailer/preferences.php diff --git a/public/include/lib/swiftmailer/swift_init.php b/include/lib/swiftmailer/swift_init.php similarity index 100% rename from public/include/lib/swiftmailer/swift_init.php rename to include/lib/swiftmailer/swift_init.php diff --git a/public/include/lib/swiftmailer/swift_required.php b/include/lib/swiftmailer/swift_required.php similarity index 100% rename from public/include/lib/swiftmailer/swift_required.php rename to include/lib/swiftmailer/swift_required.php diff --git a/public/include/lib/swiftmailer/swift_required_pear.php b/include/lib/swiftmailer/swift_required_pear.php similarity index 100% rename from public/include/lib/swiftmailer/swift_required_pear.php rename to include/lib/swiftmailer/swift_required_pear.php diff --git a/public/include/lib/swiftmailer/swiftmailer_generate_mimes_config.php b/include/lib/swiftmailer/swiftmailer_generate_mimes_config.php similarity index 100% rename from public/include/lib/swiftmailer/swiftmailer_generate_mimes_config.php rename to include/lib/swiftmailer/swiftmailer_generate_mimes_config.php diff --git a/public/include/pages/about.inc.php b/include/pages/about.inc.php similarity index 100% rename from public/include/pages/about.inc.php rename to include/pages/about.inc.php diff --git a/public/include/pages/about/api.inc.php b/include/pages/about/api.inc.php similarity index 100% rename from public/include/pages/about/api.inc.php rename to include/pages/about/api.inc.php diff --git a/public/include/pages/about/chat.inc.php b/include/pages/about/chat.inc.php similarity index 100% rename from public/include/pages/about/chat.inc.php rename to include/pages/about/chat.inc.php diff --git a/public/include/pages/about/moot.inc.php b/include/pages/about/moot.inc.php similarity index 100% rename from public/include/pages/about/moot.inc.php rename to include/pages/about/moot.inc.php diff --git a/public/include/pages/about/pool.inc.php b/include/pages/about/pool.inc.php similarity index 100% rename from public/include/pages/about/pool.inc.php rename to include/pages/about/pool.inc.php diff --git a/public/include/pages/about/pplns.inc.php b/include/pages/about/pplns.inc.php similarity index 100% rename from public/include/pages/about/pplns.inc.php rename to include/pages/about/pplns.inc.php diff --git a/public/include/pages/account.inc.php b/include/pages/account.inc.php similarity index 100% rename from public/include/pages/account.inc.php rename to include/pages/account.inc.php diff --git a/public/include/pages/account/confirm.inc.php b/include/pages/account/confirm.inc.php similarity index 100% rename from public/include/pages/account/confirm.inc.php rename to include/pages/account/confirm.inc.php diff --git a/public/include/pages/account/earnings.inc.php b/include/pages/account/earnings.inc.php similarity index 100% rename from public/include/pages/account/earnings.inc.php rename to include/pages/account/earnings.inc.php diff --git a/public/include/pages/account/edit.inc.php b/include/pages/account/edit.inc.php similarity index 100% rename from public/include/pages/account/edit.inc.php rename to include/pages/account/edit.inc.php diff --git a/public/include/pages/account/invitations.inc.php b/include/pages/account/invitations.inc.php similarity index 100% rename from public/include/pages/account/invitations.inc.php rename to include/pages/account/invitations.inc.php diff --git a/public/include/pages/account/notifications.inc.php b/include/pages/account/notifications.inc.php similarity index 100% rename from public/include/pages/account/notifications.inc.php rename to include/pages/account/notifications.inc.php diff --git a/public/include/pages/account/qrcode.inc.php b/include/pages/account/qrcode.inc.php similarity index 100% rename from public/include/pages/account/qrcode.inc.php rename to include/pages/account/qrcode.inc.php diff --git a/public/include/pages/account/reset_failed.inc.php b/include/pages/account/reset_failed.inc.php similarity index 100% rename from public/include/pages/account/reset_failed.inc.php rename to include/pages/account/reset_failed.inc.php diff --git a/public/include/pages/account/transactions.inc.php b/include/pages/account/transactions.inc.php similarity index 100% rename from public/include/pages/account/transactions.inc.php rename to include/pages/account/transactions.inc.php diff --git a/public/include/pages/account/unlock.inc.php b/include/pages/account/unlock.inc.php similarity index 100% rename from public/include/pages/account/unlock.inc.php rename to include/pages/account/unlock.inc.php diff --git a/public/include/pages/account/workers.inc.php b/include/pages/account/workers.inc.php similarity index 100% rename from public/include/pages/account/workers.inc.php rename to include/pages/account/workers.inc.php diff --git a/public/include/pages/admin.inc.php b/include/pages/admin.inc.php similarity index 100% rename from public/include/pages/admin.inc.php rename to include/pages/admin.inc.php diff --git a/public/include/pages/admin/dashboard.inc.php b/include/pages/admin/dashboard.inc.php similarity index 100% rename from public/include/pages/admin/dashboard.inc.php rename to include/pages/admin/dashboard.inc.php diff --git a/public/include/pages/admin/earnings.inc.php b/include/pages/admin/earnings.inc.php similarity index 100% rename from public/include/pages/admin/earnings.inc.php rename to include/pages/admin/earnings.inc.php diff --git a/public/include/pages/admin/invitations.inc.php b/include/pages/admin/invitations.inc.php similarity index 100% rename from public/include/pages/admin/invitations.inc.php rename to include/pages/admin/invitations.inc.php diff --git a/public/include/pages/admin/monitoring.inc.php b/include/pages/admin/monitoring.inc.php similarity index 100% rename from public/include/pages/admin/monitoring.inc.php rename to include/pages/admin/monitoring.inc.php diff --git a/public/include/pages/admin/news.inc.php b/include/pages/admin/news.inc.php similarity index 100% rename from public/include/pages/admin/news.inc.php rename to include/pages/admin/news.inc.php diff --git a/public/include/pages/admin/news_edit.inc.php b/include/pages/admin/news_edit.inc.php similarity index 100% rename from public/include/pages/admin/news_edit.inc.php rename to include/pages/admin/news_edit.inc.php diff --git a/public/include/pages/admin/newsletter.inc.php b/include/pages/admin/newsletter.inc.php similarity index 100% rename from public/include/pages/admin/newsletter.inc.php rename to include/pages/admin/newsletter.inc.php diff --git a/public/include/pages/admin/poolworkers.inc.php b/include/pages/admin/poolworkers.inc.php similarity index 100% rename from public/include/pages/admin/poolworkers.inc.php rename to include/pages/admin/poolworkers.inc.php diff --git a/public/include/pages/admin/registrations.inc.php b/include/pages/admin/registrations.inc.php similarity index 100% rename from public/include/pages/admin/registrations.inc.php rename to include/pages/admin/registrations.inc.php diff --git a/public/include/pages/admin/reports.inc.php b/include/pages/admin/reports.inc.php similarity index 100% rename from public/include/pages/admin/reports.inc.php rename to include/pages/admin/reports.inc.php diff --git a/public/include/pages/admin/settings.inc.php b/include/pages/admin/settings.inc.php similarity index 100% rename from public/include/pages/admin/settings.inc.php rename to include/pages/admin/settings.inc.php diff --git a/public/include/pages/admin/transactions.inc.php b/include/pages/admin/transactions.inc.php similarity index 100% rename from public/include/pages/admin/transactions.inc.php rename to include/pages/admin/transactions.inc.php diff --git a/public/include/pages/admin/user.inc.php b/include/pages/admin/user.inc.php similarity index 100% rename from public/include/pages/admin/user.inc.php rename to include/pages/admin/user.inc.php diff --git a/public/include/pages/admin/userdetails.inc.php b/include/pages/admin/userdetails.inc.php similarity index 100% rename from public/include/pages/admin/userdetails.inc.php rename to include/pages/admin/userdetails.inc.php diff --git a/public/include/pages/admin/wallet.inc.php b/include/pages/admin/wallet.inc.php similarity index 100% rename from public/include/pages/admin/wallet.inc.php rename to include/pages/admin/wallet.inc.php diff --git a/public/include/pages/api.inc.php b/include/pages/api.inc.php similarity index 100% rename from public/include/pages/api.inc.php rename to include/pages/api.inc.php diff --git a/public/include/pages/api/getblockcount.inc.php b/include/pages/api/getblockcount.inc.php similarity index 100% rename from public/include/pages/api/getblockcount.inc.php rename to include/pages/api/getblockcount.inc.php diff --git a/public/include/pages/api/getblocksfound.inc.php b/include/pages/api/getblocksfound.inc.php similarity index 100% rename from public/include/pages/api/getblocksfound.inc.php rename to include/pages/api/getblocksfound.inc.php diff --git a/public/include/pages/api/getblockstats.inc.php b/include/pages/api/getblockstats.inc.php similarity index 100% rename from public/include/pages/api/getblockstats.inc.php rename to include/pages/api/getblockstats.inc.php diff --git a/public/include/pages/api/getcronjobstatus.inc.php b/include/pages/api/getcronjobstatus.inc.php similarity index 100% rename from public/include/pages/api/getcronjobstatus.inc.php rename to include/pages/api/getcronjobstatus.inc.php diff --git a/public/include/pages/api/getcurrentworkers.inc.php b/include/pages/api/getcurrentworkers.inc.php similarity index 100% rename from public/include/pages/api/getcurrentworkers.inc.php rename to include/pages/api/getcurrentworkers.inc.php diff --git a/public/include/pages/api/getdashboarddata.inc.php b/include/pages/api/getdashboarddata.inc.php similarity index 100% rename from public/include/pages/api/getdashboarddata.inc.php rename to include/pages/api/getdashboarddata.inc.php diff --git a/public/include/pages/api/getdifficulty.inc.php b/include/pages/api/getdifficulty.inc.php similarity index 100% rename from public/include/pages/api/getdifficulty.inc.php rename to include/pages/api/getdifficulty.inc.php diff --git a/public/include/pages/api/getestimatedtime.inc.php b/include/pages/api/getestimatedtime.inc.php similarity index 100% rename from public/include/pages/api/getestimatedtime.inc.php rename to include/pages/api/getestimatedtime.inc.php diff --git a/public/include/pages/api/gethourlyhashrates.inc.php b/include/pages/api/gethourlyhashrates.inc.php similarity index 100% rename from public/include/pages/api/gethourlyhashrates.inc.php rename to include/pages/api/gethourlyhashrates.inc.php diff --git a/public/include/pages/api/getpoolhashrate.inc.php b/include/pages/api/getpoolhashrate.inc.php similarity index 100% rename from public/include/pages/api/getpoolhashrate.inc.php rename to include/pages/api/getpoolhashrate.inc.php diff --git a/public/include/pages/api/getpoolinfo.inc.php b/include/pages/api/getpoolinfo.inc.php similarity index 100% rename from public/include/pages/api/getpoolinfo.inc.php rename to include/pages/api/getpoolinfo.inc.php diff --git a/public/include/pages/api/getpoolsharerate.inc.php b/include/pages/api/getpoolsharerate.inc.php similarity index 100% rename from public/include/pages/api/getpoolsharerate.inc.php rename to include/pages/api/getpoolsharerate.inc.php diff --git a/public/include/pages/api/getpoolstatus.inc.php b/include/pages/api/getpoolstatus.inc.php similarity index 100% rename from public/include/pages/api/getpoolstatus.inc.php rename to include/pages/api/getpoolstatus.inc.php diff --git a/public/include/pages/api/gettimesincelastblock.inc.php b/include/pages/api/gettimesincelastblock.inc.php similarity index 100% rename from public/include/pages/api/gettimesincelastblock.inc.php rename to include/pages/api/gettimesincelastblock.inc.php diff --git a/public/include/pages/api/gettopcontributors.inc.php b/include/pages/api/gettopcontributors.inc.php similarity index 100% rename from public/include/pages/api/gettopcontributors.inc.php rename to include/pages/api/gettopcontributors.inc.php diff --git a/public/include/pages/api/getuserbalance.inc.php b/include/pages/api/getuserbalance.inc.php similarity index 100% rename from public/include/pages/api/getuserbalance.inc.php rename to include/pages/api/getuserbalance.inc.php diff --git a/public/include/pages/api/getuserhashrate.inc.php b/include/pages/api/getuserhashrate.inc.php similarity index 100% rename from public/include/pages/api/getuserhashrate.inc.php rename to include/pages/api/getuserhashrate.inc.php diff --git a/public/include/pages/api/getusersharerate.inc.php b/include/pages/api/getusersharerate.inc.php similarity index 100% rename from public/include/pages/api/getusersharerate.inc.php rename to include/pages/api/getusersharerate.inc.php diff --git a/public/include/pages/api/getuserstatus.inc.php b/include/pages/api/getuserstatus.inc.php similarity index 100% rename from public/include/pages/api/getuserstatus.inc.php rename to include/pages/api/getuserstatus.inc.php diff --git a/public/include/pages/api/getusertransactions.inc.php b/include/pages/api/getusertransactions.inc.php similarity index 100% rename from public/include/pages/api/getusertransactions.inc.php rename to include/pages/api/getusertransactions.inc.php diff --git a/public/include/pages/api/getuserworkers.inc.php b/include/pages/api/getuserworkers.inc.php similarity index 100% rename from public/include/pages/api/getuserworkers.inc.php rename to include/pages/api/getuserworkers.inc.php diff --git a/public/include/pages/api/public.inc.php b/include/pages/api/public.inc.php similarity index 100% rename from public/include/pages/api/public.inc.php rename to include/pages/api/public.inc.php diff --git a/public/include/pages/contactform.inc.php b/include/pages/contactform.inc.php similarity index 100% rename from public/include/pages/contactform.inc.php rename to include/pages/contactform.inc.php diff --git a/public/include/pages/contactform/contactform.inc.php b/include/pages/contactform/contactform.inc.php similarity index 100% rename from public/include/pages/contactform/contactform.inc.php rename to include/pages/contactform/contactform.inc.php diff --git a/public/include/pages/dashboard.inc.php b/include/pages/dashboard.inc.php similarity index 100% rename from public/include/pages/dashboard.inc.php rename to include/pages/dashboard.inc.php diff --git a/public/include/pages/error.inc.php b/include/pages/error.inc.php similarity index 100% rename from public/include/pages/error.inc.php rename to include/pages/error.inc.php diff --git a/public/include/pages/error/404.inc.php b/include/pages/error/404.inc.php similarity index 100% rename from public/include/pages/error/404.inc.php rename to include/pages/error/404.inc.php diff --git a/public/include/pages/error/ratelimit.inc.php b/include/pages/error/ratelimit.inc.php similarity index 100% rename from public/include/pages/error/ratelimit.inc.php rename to include/pages/error/ratelimit.inc.php diff --git a/public/include/pages/gettingstarted.inc.php b/include/pages/gettingstarted.inc.php similarity index 100% rename from public/include/pages/gettingstarted.inc.php rename to include/pages/gettingstarted.inc.php diff --git a/public/include/pages/home.inc.php b/include/pages/home.inc.php similarity index 100% rename from public/include/pages/home.inc.php rename to include/pages/home.inc.php diff --git a/public/include/pages/login.inc.php b/include/pages/login.inc.php similarity index 100% rename from public/include/pages/login.inc.php rename to include/pages/login.inc.php diff --git a/public/include/pages/logout.inc.php b/include/pages/logout.inc.php similarity index 100% rename from public/include/pages/logout.inc.php rename to include/pages/logout.inc.php diff --git a/public/include/pages/news.inc.php b/include/pages/news.inc.php similarity index 100% rename from public/include/pages/news.inc.php rename to include/pages/news.inc.php diff --git a/public/include/pages/password.inc.php b/include/pages/password.inc.php similarity index 100% rename from public/include/pages/password.inc.php rename to include/pages/password.inc.php diff --git a/public/include/pages/password/change.inc.php b/include/pages/password/change.inc.php similarity index 100% rename from public/include/pages/password/change.inc.php rename to include/pages/password/change.inc.php diff --git a/public/include/pages/password/reset.inc.php b/include/pages/password/reset.inc.php similarity index 100% rename from public/include/pages/password/reset.inc.php rename to include/pages/password/reset.inc.php diff --git a/public/include/pages/register.inc.php b/include/pages/register.inc.php similarity index 100% rename from public/include/pages/register.inc.php rename to include/pages/register.inc.php diff --git a/public/include/pages/register/register.inc.php b/include/pages/register/register.inc.php similarity index 100% rename from public/include/pages/register/register.inc.php rename to include/pages/register/register.inc.php diff --git a/public/include/pages/statistics.inc.php b/include/pages/statistics.inc.php similarity index 100% rename from public/include/pages/statistics.inc.php rename to include/pages/statistics.inc.php diff --git a/public/include/pages/statistics/blockfinder.inc.php b/include/pages/statistics/blockfinder.inc.php similarity index 100% rename from public/include/pages/statistics/blockfinder.inc.php rename to include/pages/statistics/blockfinder.inc.php diff --git a/public/include/pages/statistics/blocks.inc.php b/include/pages/statistics/blocks.inc.php similarity index 100% rename from public/include/pages/statistics/blocks.inc.php rename to include/pages/statistics/blocks.inc.php diff --git a/public/include/pages/statistics/donors.inc.php b/include/pages/statistics/donors.inc.php similarity index 100% rename from public/include/pages/statistics/donors.inc.php rename to include/pages/statistics/donors.inc.php diff --git a/public/include/pages/statistics/graphs.inc.php b/include/pages/statistics/graphs.inc.php similarity index 100% rename from public/include/pages/statistics/graphs.inc.php rename to include/pages/statistics/graphs.inc.php diff --git a/public/include/pages/statistics/pool.inc.php b/include/pages/statistics/pool.inc.php similarity index 100% rename from public/include/pages/statistics/pool.inc.php rename to include/pages/statistics/pool.inc.php diff --git a/public/include/pages/statistics/round.inc.php b/include/pages/statistics/round.inc.php similarity index 100% rename from public/include/pages/statistics/round.inc.php rename to include/pages/statistics/round.inc.php diff --git a/public/include/pages/statistics/uptime.inc.php b/include/pages/statistics/uptime.inc.php similarity index 100% rename from public/include/pages/statistics/uptime.inc.php rename to include/pages/statistics/uptime.inc.php diff --git a/public/include/pages/tac.inc.php b/include/pages/tac.inc.php similarity index 100% rename from public/include/pages/tac.inc.php rename to include/pages/tac.inc.php diff --git a/public/include/pages/tacpop.inc.php b/include/pages/tacpop.inc.php similarity index 100% rename from public/include/pages/tacpop.inc.php rename to include/pages/tacpop.inc.php diff --git a/public/include/smarty.inc.php b/include/smarty.inc.php similarity index 82% rename from public/include/smarty.inc.php rename to include/smarty.inc.php index bb931fe5..ac2935d9 100644 --- a/public/include/smarty.inc.php +++ b/include/smarty.inc.php @@ -13,8 +13,8 @@ $smarty = new Smarty; // Assign our local paths $debug->append('Define Smarty Paths', 3); -$smarty->template_dir = BASEPATH . 'templates/' . THEME . '/'; -$smarty->compile_dir = BASEPATH . 'templates/compile/' . THEME . '/'; +$smarty->template_dir = TEMPLATE_DIR . '/' . THEME . '/'; +$smarty->compile_dir = TEMPLATE_DIR . '/compile/' . THEME . '/'; $smarty_cache_key = md5(serialize($_REQUEST) . serialize(@$_SESSION['USERDATA']['id'])); // Optional smarty caching, check Smarty documentation for details @@ -22,7 +22,7 @@ if ($config['smarty']['cache']) { $debug->append('Enable smarty cache'); $smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED); $smarty->cache_lifetime = $config['smarty']['cache_lifetime']; - $smarty->cache_dir = BASEPATH . "templates/cache/" . THEME; + $smarty->cache_dir = TEMPLATE_DIR . '/cache/' . THEME; $smarty->escape_html = true; $smarty->use_sub_dirs = true; } diff --git a/public/include/smarty/libs/Smarty.class.php b/include/smarty/libs/Smarty.class.php similarity index 100% rename from public/include/smarty/libs/Smarty.class.php rename to include/smarty/libs/Smarty.class.php diff --git a/public/include/smarty/libs/SmartyBC.class.php b/include/smarty/libs/SmartyBC.class.php similarity index 100% rename from public/include/smarty/libs/SmartyBC.class.php rename to include/smarty/libs/SmartyBC.class.php diff --git a/public/include/smarty/libs/debug.tpl b/include/smarty/libs/debug.tpl similarity index 100% rename from public/include/smarty/libs/debug.tpl rename to include/smarty/libs/debug.tpl diff --git a/public/include/smarty/libs/plugins/block.textformat.php b/include/smarty/libs/plugins/block.textformat.php similarity index 100% rename from public/include/smarty/libs/plugins/block.textformat.php rename to include/smarty/libs/plugins/block.textformat.php diff --git a/public/include/smarty/libs/plugins/function.counter.php b/include/smarty/libs/plugins/function.counter.php similarity index 100% rename from public/include/smarty/libs/plugins/function.counter.php rename to include/smarty/libs/plugins/function.counter.php diff --git a/public/include/smarty/libs/plugins/function.cycle.php b/include/smarty/libs/plugins/function.cycle.php similarity index 100% rename from public/include/smarty/libs/plugins/function.cycle.php rename to include/smarty/libs/plugins/function.cycle.php diff --git a/public/include/smarty/libs/plugins/function.fetch.php b/include/smarty/libs/plugins/function.fetch.php similarity index 100% rename from public/include/smarty/libs/plugins/function.fetch.php rename to include/smarty/libs/plugins/function.fetch.php diff --git a/public/include/smarty/libs/plugins/function.html_checkboxes.php b/include/smarty/libs/plugins/function.html_checkboxes.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_checkboxes.php rename to include/smarty/libs/plugins/function.html_checkboxes.php diff --git a/public/include/smarty/libs/plugins/function.html_image.php b/include/smarty/libs/plugins/function.html_image.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_image.php rename to include/smarty/libs/plugins/function.html_image.php diff --git a/public/include/smarty/libs/plugins/function.html_options.php b/include/smarty/libs/plugins/function.html_options.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_options.php rename to include/smarty/libs/plugins/function.html_options.php diff --git a/public/include/smarty/libs/plugins/function.html_radios.php b/include/smarty/libs/plugins/function.html_radios.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_radios.php rename to include/smarty/libs/plugins/function.html_radios.php diff --git a/public/include/smarty/libs/plugins/function.html_select_date.php b/include/smarty/libs/plugins/function.html_select_date.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_select_date.php rename to include/smarty/libs/plugins/function.html_select_date.php diff --git a/public/include/smarty/libs/plugins/function.html_select_time.php b/include/smarty/libs/plugins/function.html_select_time.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_select_time.php rename to include/smarty/libs/plugins/function.html_select_time.php diff --git a/public/include/smarty/libs/plugins/function.html_table.php b/include/smarty/libs/plugins/function.html_table.php similarity index 100% rename from public/include/smarty/libs/plugins/function.html_table.php rename to include/smarty/libs/plugins/function.html_table.php diff --git a/public/include/smarty/libs/plugins/function.mailto.php b/include/smarty/libs/plugins/function.mailto.php similarity index 100% rename from public/include/smarty/libs/plugins/function.mailto.php rename to include/smarty/libs/plugins/function.mailto.php diff --git a/public/include/smarty/libs/plugins/function.math.php b/include/smarty/libs/plugins/function.math.php similarity index 100% rename from public/include/smarty/libs/plugins/function.math.php rename to include/smarty/libs/plugins/function.math.php diff --git a/public/include/smarty/libs/plugins/modifier.capitalize.php b/include/smarty/libs/plugins/modifier.capitalize.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.capitalize.php rename to include/smarty/libs/plugins/modifier.capitalize.php diff --git a/public/include/smarty/libs/plugins/modifier.date_format.php b/include/smarty/libs/plugins/modifier.date_format.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.date_format.php rename to include/smarty/libs/plugins/modifier.date_format.php diff --git a/public/include/smarty/libs/plugins/modifier.debug_print_var.php b/include/smarty/libs/plugins/modifier.debug_print_var.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.debug_print_var.php rename to include/smarty/libs/plugins/modifier.debug_print_var.php diff --git a/public/include/smarty/libs/plugins/modifier.escape.php b/include/smarty/libs/plugins/modifier.escape.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.escape.php rename to include/smarty/libs/plugins/modifier.escape.php diff --git a/public/include/smarty/libs/plugins/modifier.regex_replace.php b/include/smarty/libs/plugins/modifier.regex_replace.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.regex_replace.php rename to include/smarty/libs/plugins/modifier.regex_replace.php diff --git a/public/include/smarty/libs/plugins/modifier.relative_date.php b/include/smarty/libs/plugins/modifier.relative_date.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.relative_date.php rename to include/smarty/libs/plugins/modifier.relative_date.php diff --git a/public/include/smarty/libs/plugins/modifier.replace.php b/include/smarty/libs/plugins/modifier.replace.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.replace.php rename to include/smarty/libs/plugins/modifier.replace.php diff --git a/public/include/smarty/libs/plugins/modifier.seconds_to_words.php b/include/smarty/libs/plugins/modifier.seconds_to_words.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.seconds_to_words.php rename to include/smarty/libs/plugins/modifier.seconds_to_words.php diff --git a/public/include/smarty/libs/plugins/modifier.spacify.php b/include/smarty/libs/plugins/modifier.spacify.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.spacify.php rename to include/smarty/libs/plugins/modifier.spacify.php diff --git a/public/include/smarty/libs/plugins/modifier.truncate.php b/include/smarty/libs/plugins/modifier.truncate.php similarity index 100% rename from public/include/smarty/libs/plugins/modifier.truncate.php rename to include/smarty/libs/plugins/modifier.truncate.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.cat.php b/include/smarty/libs/plugins/modifiercompiler.cat.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.cat.php rename to include/smarty/libs/plugins/modifiercompiler.cat.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.count_characters.php b/include/smarty/libs/plugins/modifiercompiler.count_characters.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.count_characters.php rename to include/smarty/libs/plugins/modifiercompiler.count_characters.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php rename to include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.count_sentences.php b/include/smarty/libs/plugins/modifiercompiler.count_sentences.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.count_sentences.php rename to include/smarty/libs/plugins/modifiercompiler.count_sentences.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.count_words.php b/include/smarty/libs/plugins/modifiercompiler.count_words.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.count_words.php rename to include/smarty/libs/plugins/modifiercompiler.count_words.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.default.php b/include/smarty/libs/plugins/modifiercompiler.default.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.default.php rename to include/smarty/libs/plugins/modifiercompiler.default.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.escape.php b/include/smarty/libs/plugins/modifiercompiler.escape.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.escape.php rename to include/smarty/libs/plugins/modifiercompiler.escape.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.from_charset.php b/include/smarty/libs/plugins/modifiercompiler.from_charset.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.from_charset.php rename to include/smarty/libs/plugins/modifiercompiler.from_charset.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.indent.php b/include/smarty/libs/plugins/modifiercompiler.indent.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.indent.php rename to include/smarty/libs/plugins/modifiercompiler.indent.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.lower.php b/include/smarty/libs/plugins/modifiercompiler.lower.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.lower.php rename to include/smarty/libs/plugins/modifiercompiler.lower.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.noprint.php b/include/smarty/libs/plugins/modifiercompiler.noprint.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.noprint.php rename to include/smarty/libs/plugins/modifiercompiler.noprint.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.string_format.php b/include/smarty/libs/plugins/modifiercompiler.string_format.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.string_format.php rename to include/smarty/libs/plugins/modifiercompiler.string_format.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.strip.php b/include/smarty/libs/plugins/modifiercompiler.strip.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.strip.php rename to include/smarty/libs/plugins/modifiercompiler.strip.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.strip_tags.php b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.strip_tags.php rename to include/smarty/libs/plugins/modifiercompiler.strip_tags.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.to_charset.php b/include/smarty/libs/plugins/modifiercompiler.to_charset.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.to_charset.php rename to include/smarty/libs/plugins/modifiercompiler.to_charset.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.unescape.php b/include/smarty/libs/plugins/modifiercompiler.unescape.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.unescape.php rename to include/smarty/libs/plugins/modifiercompiler.unescape.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.upper.php b/include/smarty/libs/plugins/modifiercompiler.upper.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.upper.php rename to include/smarty/libs/plugins/modifiercompiler.upper.php diff --git a/public/include/smarty/libs/plugins/modifiercompiler.wordwrap.php b/include/smarty/libs/plugins/modifiercompiler.wordwrap.php similarity index 100% rename from public/include/smarty/libs/plugins/modifiercompiler.wordwrap.php rename to include/smarty/libs/plugins/modifiercompiler.wordwrap.php diff --git a/public/include/smarty/libs/plugins/outputfilter.trimwhitespace.php b/include/smarty/libs/plugins/outputfilter.trimwhitespace.php similarity index 100% rename from public/include/smarty/libs/plugins/outputfilter.trimwhitespace.php rename to include/smarty/libs/plugins/outputfilter.trimwhitespace.php diff --git a/public/include/smarty/libs/plugins/shared.escape_special_chars.php b/include/smarty/libs/plugins/shared.escape_special_chars.php similarity index 100% rename from public/include/smarty/libs/plugins/shared.escape_special_chars.php rename to include/smarty/libs/plugins/shared.escape_special_chars.php diff --git a/public/include/smarty/libs/plugins/shared.literal_compiler_param.php b/include/smarty/libs/plugins/shared.literal_compiler_param.php similarity index 100% rename from public/include/smarty/libs/plugins/shared.literal_compiler_param.php rename to include/smarty/libs/plugins/shared.literal_compiler_param.php diff --git a/public/include/smarty/libs/plugins/shared.make_timestamp.php b/include/smarty/libs/plugins/shared.make_timestamp.php similarity index 100% rename from public/include/smarty/libs/plugins/shared.make_timestamp.php rename to include/smarty/libs/plugins/shared.make_timestamp.php diff --git a/public/include/smarty/libs/plugins/shared.mb_str_replace.php b/include/smarty/libs/plugins/shared.mb_str_replace.php similarity index 100% rename from public/include/smarty/libs/plugins/shared.mb_str_replace.php rename to include/smarty/libs/plugins/shared.mb_str_replace.php diff --git a/public/include/smarty/libs/plugins/shared.mb_unicode.php b/include/smarty/libs/plugins/shared.mb_unicode.php similarity index 100% rename from public/include/smarty/libs/plugins/shared.mb_unicode.php rename to include/smarty/libs/plugins/shared.mb_unicode.php diff --git a/public/include/smarty/libs/plugins/shared.mb_wordwrap.php b/include/smarty/libs/plugins/shared.mb_wordwrap.php similarity index 100% rename from public/include/smarty/libs/plugins/shared.mb_wordwrap.php rename to include/smarty/libs/plugins/shared.mb_wordwrap.php diff --git a/public/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php similarity index 100% rename from public/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php rename to include/smarty/libs/plugins/variablefilter.htmlspecialchars.php diff --git a/public/include/smarty/libs/sysplugins/smarty_cacheresource.php b/include/smarty/libs/sysplugins/smarty_cacheresource.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_cacheresource.php rename to include/smarty/libs/sysplugins/smarty_cacheresource.php diff --git a/public/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php rename to include/smarty/libs/sysplugins/smarty_cacheresource_custom.php diff --git a/public/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php rename to include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php diff --git a/public/include/smarty/libs/sysplugins/smarty_config_source.php b/include/smarty/libs/sysplugins/smarty_config_source.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_config_source.php rename to include/smarty/libs/sysplugins/smarty_config_source.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php rename to include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_append.php b/include/smarty/libs/sysplugins/smarty_internal_compile_append.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_append.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_append.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_assign.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_block.php b/include/smarty/libs/sysplugins/smarty_internal_compile_block.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_block.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_block.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_break.php b/include/smarty/libs/sysplugins/smarty_internal_compile_break.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_break.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_break.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_call.php b/include/smarty/libs/sysplugins/smarty_internal_compile_call.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_call.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_call.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_capture.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_continue.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_debug.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_eval.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_extends.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_for.php b/include/smarty/libs/sysplugins/smarty_internal_compile_for.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_for.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_for.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_function.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_function.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_function.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_if.php b/include/smarty/libs/sysplugins/smarty_internal_compile_if.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_if.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_if.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_include.php b/include/smarty/libs/sysplugins/smarty_internal_compile_include.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_include.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_include.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_insert.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_section.php b/include/smarty/libs/sysplugins/smarty_internal_compile_section.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_section.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_section.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compile_while.php b/include/smarty/libs/sysplugins/smarty_internal_compile_while.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compile_while.php rename to include/smarty/libs/sysplugins/smarty_internal_compile_while.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_compilebase.php b/include/smarty/libs/sysplugins/smarty_internal_compilebase.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_compilebase.php rename to include/smarty/libs/sysplugins/smarty_internal_compilebase.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_config.php b/include/smarty/libs/sysplugins/smarty_internal_config.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_config.php rename to include/smarty/libs/sysplugins/smarty_internal_config.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php rename to include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php rename to include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php rename to include/smarty/libs/sysplugins/smarty_internal_configfileparser.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_data.php b/include/smarty/libs/sysplugins/smarty_internal_data.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_data.php rename to include/smarty/libs/sysplugins/smarty_internal_data.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_debug.php b/include/smarty/libs/sysplugins/smarty_internal_debug.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_debug.php rename to include/smarty/libs/sysplugins/smarty_internal_debug.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php b/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php rename to include/smarty/libs/sysplugins/smarty_internal_filter_handler.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php rename to include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php b/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php rename to include/smarty/libs/sysplugins/smarty_internal_get_include_path.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php rename to include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_parsetree.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_parsetree.php rename to include/smarty/libs/sysplugins/smarty_internal_parsetree.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_eval.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_extends.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_file.php b/include/smarty/libs/sysplugins/smarty_internal_resource_file.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_file.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_file.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_php.php b/include/smarty/libs/sysplugins/smarty_internal_resource_php.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_php.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_php.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_registered.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_stream.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_resource_string.php b/include/smarty/libs/sysplugins/smarty_internal_resource_string.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_resource_string.php rename to include/smarty/libs/sysplugins/smarty_internal_resource_string.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php rename to include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_template.php b/include/smarty/libs/sysplugins/smarty_internal_template.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_template.php rename to include/smarty/libs/sysplugins/smarty_internal_template.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_templatebase.php b/include/smarty/libs/sysplugins/smarty_internal_templatebase.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_templatebase.php rename to include/smarty/libs/sysplugins/smarty_internal_templatebase.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php rename to include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php rename to include/smarty/libs/sysplugins/smarty_internal_templatelexer.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_templateparser.php b/include/smarty/libs/sysplugins/smarty_internal_templateparser.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_templateparser.php rename to include/smarty/libs/sysplugins/smarty_internal_templateparser.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_utility.php b/include/smarty/libs/sysplugins/smarty_internal_utility.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_utility.php rename to include/smarty/libs/sysplugins/smarty_internal_utility.php diff --git a/public/include/smarty/libs/sysplugins/smarty_internal_write_file.php b/include/smarty/libs/sysplugins/smarty_internal_write_file.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_internal_write_file.php rename to include/smarty/libs/sysplugins/smarty_internal_write_file.php diff --git a/public/include/smarty/libs/sysplugins/smarty_resource.php b/include/smarty/libs/sysplugins/smarty_resource.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_resource.php rename to include/smarty/libs/sysplugins/smarty_resource.php diff --git a/public/include/smarty/libs/sysplugins/smarty_resource_custom.php b/include/smarty/libs/sysplugins/smarty_resource_custom.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_resource_custom.php rename to include/smarty/libs/sysplugins/smarty_resource_custom.php diff --git a/public/include/smarty/libs/sysplugins/smarty_resource_recompiled.php b/include/smarty/libs/sysplugins/smarty_resource_recompiled.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_resource_recompiled.php rename to include/smarty/libs/sysplugins/smarty_resource_recompiled.php diff --git a/public/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php rename to include/smarty/libs/sysplugins/smarty_resource_uncompiled.php diff --git a/public/include/smarty/libs/sysplugins/smarty_security.php b/include/smarty/libs/sysplugins/smarty_security.php similarity index 100% rename from public/include/smarty/libs/sysplugins/smarty_security.php rename to include/smarty/libs/sysplugins/smarty_security.php diff --git a/public/include/smarty_globals.inc.php b/include/smarty_globals.inc.php similarity index 100% rename from public/include/smarty_globals.inc.php rename to include/smarty_globals.inc.php diff --git a/public/include/version.inc.php b/include/version.inc.php similarity index 96% rename from public/include/version.inc.php rename to include/version.inc.php index a94bf193..f0ea33f7 100644 --- a/public/include/version.inc.php +++ b/include/version.inc.php @@ -2,7 +2,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; define('MPOS_VERSION', '0.0.4'); -define('DB_VERSION', '0.0.9'); +define('DB_VERSION', '0.0.10'); define('CONFIG_VERSION', '0.0.8'); define('HASH_VERSION', 1); diff --git a/public/.htaccess b/public/.htaccess index 9750f3bb..20cf67c6 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,4 +1,2 @@ ErrorDocument 404 /index.php?page=error&action=404 -RedirectMatch 404 /templates(/|$) -RedirectMatch 404 /include(/|$) RedirectMatch 404 /.git(/|$) diff --git a/public/index.php b/public/index.php index 5a7db5f0..d169fff9 100644 --- a/public/index.php +++ b/public/index.php @@ -37,7 +37,7 @@ if (SECHASH_CHECK) { define("BASEPATH", dirname(__FILE__) . "/"); // all our includes and config etc are now in bootstrap -include_once('include/bootstrap.php'); +include_once(BASEPATH . '../include/bootstrap.php'); // switch to https if config option is enabled $hts = ($config['https_only'] && (!empty($_SERVER['QUERY_STRING']))) ? "https://".$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']."?".$_SERVER['QUERY_STRING'] : "https://".$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']; diff --git a/scripts/shared.inc.php b/scripts/shared.inc.php index acea1d65..96ad444b 100644 --- a/scripts/shared.inc.php +++ b/scripts/shared.inc.php @@ -18,9 +18,8 @@ limitations under the License. */ -// MODIFY THIS // We need to find our include files so set this properly -define("BASEPATH", "../public/"); +define('BASEPATH', dirname(__FILE__) . '/'); /***************************************************** * No need to change beyond this point * @@ -40,14 +39,8 @@ if (SECHASH_CHECK) { } // Include our configuration (holding defines for the requires) -require_once(BASEPATH . 'include/config/global.inc.dist.php'); -require_once(BASEPATH . 'include/config/global.inc.php'); - -require_once(BASEPATH . 'include/config/security.inc.dist.php'); -@include_once(BASEPATH . 'include/config/security.inc.php'); - -require_once(BASEPATH . 'include/bootstrap.php'); -require_once(BASEPATH . 'include/version.inc.php'); +require_once(BASEPATH . '../include/bootstrap.php'); +require_once(BASEPATH . '../include/version.inc.php'); /** * Not used as of yet, may be added later diff --git a/sql/000_base_structure.sql b/sql/000_base_structure.sql index f02c1bf5..3c55f36c 100644 --- a/sql/000_base_structure.sql +++ b/sql/000_base_structure.sql @@ -134,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `settings` ( UNIQUE KEY `setting` (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.9'); +INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.10'); CREATE TABLE IF NOT EXISTS `shares` ( `id` bigint(30) NOT NULL AUTO_INCREMENT, diff --git a/public/templates/bootstrap/about/api/default.tpl b/templates/bootstrap/about/api/default.tpl similarity index 100% rename from public/templates/bootstrap/about/api/default.tpl rename to templates/bootstrap/about/api/default.tpl diff --git a/public/templates/bootstrap/about/chat/default.tpl b/templates/bootstrap/about/chat/default.tpl similarity index 100% rename from public/templates/bootstrap/about/chat/default.tpl rename to templates/bootstrap/about/chat/default.tpl diff --git a/public/templates/bootstrap/about/chat/disabled.tpl b/templates/bootstrap/about/chat/disabled.tpl similarity index 100% rename from public/templates/bootstrap/about/chat/disabled.tpl rename to templates/bootstrap/about/chat/disabled.tpl diff --git a/public/templates/bootstrap/about/default.tpl b/templates/bootstrap/about/default.tpl similarity index 100% rename from public/templates/bootstrap/about/default.tpl rename to templates/bootstrap/about/default.tpl diff --git a/public/templates/bootstrap/about/moot/default.tpl b/templates/bootstrap/about/moot/default.tpl similarity index 100% rename from public/templates/bootstrap/about/moot/default.tpl rename to templates/bootstrap/about/moot/default.tpl diff --git a/public/templates/bootstrap/about/moot/disabled.tpl b/templates/bootstrap/about/moot/disabled.tpl similarity index 100% rename from public/templates/bootstrap/about/moot/disabled.tpl rename to templates/bootstrap/about/moot/disabled.tpl diff --git a/public/templates/bootstrap/about/pool/default.tpl b/templates/bootstrap/about/pool/default.tpl similarity index 100% rename from public/templates/bootstrap/about/pool/default.tpl rename to templates/bootstrap/about/pool/default.tpl diff --git a/public/templates/bootstrap/about/pool/disabled.tpl b/templates/bootstrap/about/pool/disabled.tpl similarity index 100% rename from public/templates/bootstrap/about/pool/disabled.tpl rename to templates/bootstrap/about/pool/disabled.tpl diff --git a/public/templates/bootstrap/account/confirm/default.tpl b/templates/bootstrap/account/confirm/default.tpl similarity index 100% rename from public/templates/bootstrap/account/confirm/default.tpl rename to templates/bootstrap/account/confirm/default.tpl diff --git a/public/templates/bootstrap/account/default.tpl b/templates/bootstrap/account/default.tpl similarity index 100% rename from public/templates/bootstrap/account/default.tpl rename to templates/bootstrap/account/default.tpl diff --git a/public/templates/bootstrap/account/earnings/default.tpl b/templates/bootstrap/account/earnings/default.tpl similarity index 100% rename from public/templates/bootstrap/account/earnings/default.tpl rename to templates/bootstrap/account/earnings/default.tpl diff --git a/public/templates/bootstrap/account/edit/cashout.tpl b/templates/bootstrap/account/edit/cashout.tpl similarity index 100% rename from public/templates/bootstrap/account/edit/cashout.tpl rename to templates/bootstrap/account/edit/cashout.tpl diff --git a/public/templates/bootstrap/account/edit/default.tpl b/templates/bootstrap/account/edit/default.tpl similarity index 100% rename from public/templates/bootstrap/account/edit/default.tpl rename to templates/bootstrap/account/edit/default.tpl diff --git a/public/templates/bootstrap/account/edit/detail.tpl b/templates/bootstrap/account/edit/detail.tpl similarity index 100% rename from public/templates/bootstrap/account/edit/detail.tpl rename to templates/bootstrap/account/edit/detail.tpl diff --git a/public/templates/bootstrap/account/edit/password.tpl b/templates/bootstrap/account/edit/password.tpl similarity index 100% rename from public/templates/bootstrap/account/edit/password.tpl rename to templates/bootstrap/account/edit/password.tpl diff --git a/public/templates/bootstrap/account/edit/resetpin.tpl b/templates/bootstrap/account/edit/resetpin.tpl similarity index 100% rename from public/templates/bootstrap/account/edit/resetpin.tpl rename to templates/bootstrap/account/edit/resetpin.tpl diff --git a/public/templates/bootstrap/account/invitations/default.tpl b/templates/bootstrap/account/invitations/default.tpl similarity index 100% rename from public/templates/bootstrap/account/invitations/default.tpl rename to templates/bootstrap/account/invitations/default.tpl diff --git a/public/templates/bootstrap/account/notifications/default.tpl b/templates/bootstrap/account/notifications/default.tpl similarity index 100% rename from public/templates/bootstrap/account/notifications/default.tpl rename to templates/bootstrap/account/notifications/default.tpl diff --git a/public/templates/bootstrap/account/qrcode/default.tpl b/templates/bootstrap/account/qrcode/default.tpl similarity index 100% rename from public/templates/bootstrap/account/qrcode/default.tpl rename to templates/bootstrap/account/qrcode/default.tpl diff --git a/public/templates/bootstrap/account/qrcode/disabled.tpl b/templates/bootstrap/account/qrcode/disabled.tpl similarity index 100% rename from public/templates/bootstrap/account/qrcode/disabled.tpl rename to templates/bootstrap/account/qrcode/disabled.tpl diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/templates/bootstrap/account/transactions/default.tpl similarity index 100% rename from public/templates/bootstrap/account/transactions/default.tpl rename to templates/bootstrap/account/transactions/default.tpl diff --git a/public/templates/bootstrap/account/unlock/default.tpl b/templates/bootstrap/account/unlock/default.tpl similarity index 100% rename from public/templates/bootstrap/account/unlock/default.tpl rename to templates/bootstrap/account/unlock/default.tpl diff --git a/public/templates/bootstrap/account/workers/default.tpl b/templates/bootstrap/account/workers/default.tpl similarity index 100% rename from public/templates/bootstrap/account/workers/default.tpl rename to templates/bootstrap/account/workers/default.tpl diff --git a/public/templates/bootstrap/admin/dashboard/default.tpl b/templates/bootstrap/admin/dashboard/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/dashboard/default.tpl rename to templates/bootstrap/admin/dashboard/default.tpl diff --git a/public/templates/bootstrap/admin/dashboard/invitation.tpl b/templates/bootstrap/admin/dashboard/invitation.tpl similarity index 100% rename from public/templates/bootstrap/admin/dashboard/invitation.tpl rename to templates/bootstrap/admin/dashboard/invitation.tpl diff --git a/public/templates/bootstrap/admin/dashboard/mpos.tpl b/templates/bootstrap/admin/dashboard/mpos.tpl similarity index 100% rename from public/templates/bootstrap/admin/dashboard/mpos.tpl rename to templates/bootstrap/admin/dashboard/mpos.tpl diff --git a/public/templates/bootstrap/admin/dashboard/registrations.tpl b/templates/bootstrap/admin/dashboard/registrations.tpl similarity index 100% rename from public/templates/bootstrap/admin/dashboard/registrations.tpl rename to templates/bootstrap/admin/dashboard/registrations.tpl diff --git a/public/templates/bootstrap/admin/dashboard/user.tpl b/templates/bootstrap/admin/dashboard/user.tpl similarity index 100% rename from public/templates/bootstrap/admin/dashboard/user.tpl rename to templates/bootstrap/admin/dashboard/user.tpl diff --git a/public/templates/bootstrap/admin/invitations/default.tpl b/templates/bootstrap/admin/invitations/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/invitations/default.tpl rename to templates/bootstrap/admin/invitations/default.tpl diff --git a/public/templates/bootstrap/admin/monitoring/default.tpl b/templates/bootstrap/admin/monitoring/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/monitoring/default.tpl rename to templates/bootstrap/admin/monitoring/default.tpl diff --git a/public/templates/bootstrap/admin/news/default.tpl b/templates/bootstrap/admin/news/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/news/default.tpl rename to templates/bootstrap/admin/news/default.tpl diff --git a/public/templates/bootstrap/admin/news_edit/default.tpl b/templates/bootstrap/admin/news_edit/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/news_edit/default.tpl rename to templates/bootstrap/admin/news_edit/default.tpl diff --git a/public/templates/bootstrap/admin/newsletter/default.tpl b/templates/bootstrap/admin/newsletter/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/newsletter/default.tpl rename to templates/bootstrap/admin/newsletter/default.tpl diff --git a/public/templates/bootstrap/admin/poolworkers/default.tpl b/templates/bootstrap/admin/poolworkers/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/poolworkers/default.tpl rename to templates/bootstrap/admin/poolworkers/default.tpl diff --git a/public/templates/bootstrap/admin/registrations/default.tpl b/templates/bootstrap/admin/registrations/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/registrations/default.tpl rename to templates/bootstrap/admin/registrations/default.tpl diff --git a/public/templates/bootstrap/admin/reports/default.tpl b/templates/bootstrap/admin/reports/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/reports/default.tpl rename to templates/bootstrap/admin/reports/default.tpl diff --git a/public/templates/bootstrap/admin/reports/earnings_control.tpl b/templates/bootstrap/admin/reports/earnings_control.tpl similarity index 100% rename from public/templates/bootstrap/admin/reports/earnings_control.tpl rename to templates/bootstrap/admin/reports/earnings_control.tpl diff --git a/public/templates/bootstrap/admin/reports/earnings_report.tpl b/templates/bootstrap/admin/reports/earnings_report.tpl similarity index 100% rename from public/templates/bootstrap/admin/reports/earnings_report.tpl rename to templates/bootstrap/admin/reports/earnings_report.tpl diff --git a/public/templates/bootstrap/admin/settings/default.tpl b/templates/bootstrap/admin/settings/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/settings/default.tpl rename to templates/bootstrap/admin/settings/default.tpl diff --git a/public/templates/bootstrap/admin/transactions/default.tpl b/templates/bootstrap/admin/transactions/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/transactions/default.tpl rename to templates/bootstrap/admin/transactions/default.tpl diff --git a/public/templates/bootstrap/admin/user/default.tpl b/templates/bootstrap/admin/user/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/user/default.tpl rename to templates/bootstrap/admin/user/default.tpl diff --git a/public/templates/bootstrap/admin/userdetails/default.tpl b/templates/bootstrap/admin/userdetails/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/userdetails/default.tpl rename to templates/bootstrap/admin/userdetails/default.tpl diff --git a/public/templates/bootstrap/admin/wallet/default.tpl b/templates/bootstrap/admin/wallet/default.tpl similarity index 100% rename from public/templates/bootstrap/admin/wallet/default.tpl rename to templates/bootstrap/admin/wallet/default.tpl diff --git a/public/templates/bootstrap/contactform/contactform/default.tpl b/templates/bootstrap/contactform/contactform/default.tpl similarity index 100% rename from public/templates/bootstrap/contactform/contactform/default.tpl rename to templates/bootstrap/contactform/contactform/default.tpl diff --git a/public/templates/bootstrap/contactform/default.tpl b/templates/bootstrap/contactform/default.tpl similarity index 100% rename from public/templates/bootstrap/contactform/default.tpl rename to templates/bootstrap/contactform/default.tpl diff --git a/public/templates/bootstrap/contactform/disabled.tpl b/templates/bootstrap/contactform/disabled.tpl similarity index 100% rename from public/templates/bootstrap/contactform/disabled.tpl rename to templates/bootstrap/contactform/disabled.tpl diff --git a/public/templates/bootstrap/dashboard/account_data/_workers.tpl b/templates/bootstrap/dashboard/account_data/_workers.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/account_data/_workers.tpl rename to templates/bootstrap/dashboard/account_data/_workers.tpl diff --git a/public/templates/bootstrap/dashboard/account_data/default.tpl b/templates/bootstrap/dashboard/account_data/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/account_data/default.tpl rename to templates/bootstrap/dashboard/account_data/default.tpl diff --git a/public/templates/bootstrap/dashboard/default.tpl b/templates/bootstrap/dashboard/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/default.tpl rename to templates/bootstrap/dashboard/default.tpl diff --git a/public/templates/bootstrap/dashboard/js/api.tpl b/templates/bootstrap/dashboard/js/api.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/js/api.tpl rename to templates/bootstrap/dashboard/js/api.tpl diff --git a/public/templates/bootstrap/dashboard/js/static.tpl b/templates/bootstrap/dashboard/js/static.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/js/static.tpl rename to templates/bootstrap/dashboard/js/static.tpl diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/templates/bootstrap/dashboard/overview/_with_price_graph.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl rename to templates/bootstrap/dashboard/overview/_with_price_graph.tpl diff --git a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl b/templates/bootstrap/dashboard/overview/_without_price_graph.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl rename to templates/bootstrap/dashboard/overview/_without_price_graph.tpl diff --git a/public/templates/bootstrap/dashboard/overview/default.tpl b/templates/bootstrap/dashboard/overview/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/overview/default.tpl rename to templates/bootstrap/dashboard/overview/default.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl b/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl rename to templates/bootstrap/dashboard/round_statistics/pplns/default.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl rename to templates/bootstrap/dashboard/round_statistics/pplns/round.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl b/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl rename to templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/default.tpl b/templates/bootstrap/dashboard/round_statistics/pps/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/pps/default.tpl rename to templates/bootstrap/dashboard/round_statistics/pps/default.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl b/templates/bootstrap/dashboard/round_statistics/pps/round.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl rename to templates/bootstrap/dashboard/round_statistics/pps/round.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/shares.tpl b/templates/bootstrap/dashboard/round_statistics/pps/shares.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/pps/shares.tpl rename to templates/bootstrap/dashboard/round_statistics/pps/shares.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl b/templates/bootstrap/dashboard/round_statistics/prop/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl rename to templates/bootstrap/dashboard/round_statistics/prop/default.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/templates/bootstrap/dashboard/round_statistics/prop/round.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl rename to templates/bootstrap/dashboard/round_statistics/prop/round.tpl diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl b/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl rename to templates/bootstrap/dashboard/round_statistics/prop/shares.tpl diff --git a/public/templates/bootstrap/dashboard/worker_information/default.tpl b/templates/bootstrap/dashboard/worker_information/default.tpl similarity index 100% rename from public/templates/bootstrap/dashboard/worker_information/default.tpl rename to templates/bootstrap/dashboard/worker_information/default.tpl diff --git a/public/templates/bootstrap/error/404/default.tpl b/templates/bootstrap/error/404/default.tpl similarity index 100% rename from public/templates/bootstrap/error/404/default.tpl rename to templates/bootstrap/error/404/default.tpl diff --git a/public/templates/bootstrap/error/default.tpl b/templates/bootstrap/error/default.tpl similarity index 100% rename from public/templates/bootstrap/error/default.tpl rename to templates/bootstrap/error/default.tpl diff --git a/public/templates/bootstrap/error/ratelimit/default.tpl b/templates/bootstrap/error/ratelimit/default.tpl similarity index 100% rename from public/templates/bootstrap/error/ratelimit/default.tpl rename to templates/bootstrap/error/ratelimit/default.tpl diff --git a/public/templates/bootstrap/gettingstarted/default.tpl b/templates/bootstrap/gettingstarted/default.tpl similarity index 100% rename from public/templates/bootstrap/gettingstarted/default.tpl rename to templates/bootstrap/gettingstarted/default.tpl diff --git a/public/templates/bootstrap/global/footer.tpl b/templates/bootstrap/global/footer.tpl similarity index 100% rename from public/templates/bootstrap/global/footer.tpl rename to templates/bootstrap/global/footer.tpl diff --git a/public/templates/bootstrap/global/header.tpl b/templates/bootstrap/global/header.tpl similarity index 100% rename from public/templates/bootstrap/global/header.tpl rename to templates/bootstrap/global/header.tpl diff --git a/public/templates/bootstrap/global/navigation.tpl b/templates/bootstrap/global/navigation.tpl similarity index 100% rename from public/templates/bootstrap/global/navigation.tpl rename to templates/bootstrap/global/navigation.tpl diff --git a/public/templates/bootstrap/global/navjs_api.tpl b/templates/bootstrap/global/navjs_api.tpl similarity index 100% rename from public/templates/bootstrap/global/navjs_api.tpl rename to templates/bootstrap/global/navjs_api.tpl diff --git a/public/templates/bootstrap/global/navjs_static.tpl b/templates/bootstrap/global/navjs_static.tpl similarity index 100% rename from public/templates/bootstrap/global/navjs_static.tpl rename to templates/bootstrap/global/navjs_static.tpl diff --git a/public/templates/bootstrap/home/default.tpl b/templates/bootstrap/home/default.tpl similarity index 100% rename from public/templates/bootstrap/home/default.tpl rename to templates/bootstrap/home/default.tpl diff --git a/public/templates/bootstrap/home/news_accordion.tpl b/templates/bootstrap/home/news_accordion.tpl similarity index 100% rename from public/templates/bootstrap/home/news_accordion.tpl rename to templates/bootstrap/home/news_accordion.tpl diff --git a/public/templates/bootstrap/home/news_all.tpl b/templates/bootstrap/home/news_all.tpl similarity index 100% rename from public/templates/bootstrap/home/news_all.tpl rename to templates/bootstrap/home/news_all.tpl diff --git a/public/templates/bootstrap/login/default.tpl b/templates/bootstrap/login/default.tpl similarity index 100% rename from public/templates/bootstrap/login/default.tpl rename to templates/bootstrap/login/default.tpl diff --git a/public/templates/bootstrap/master.tpl b/templates/bootstrap/master.tpl similarity index 100% rename from public/templates/bootstrap/master.tpl rename to templates/bootstrap/master.tpl diff --git a/public/templates/bootstrap/password/change/default.tpl b/templates/bootstrap/password/change/default.tpl similarity index 100% rename from public/templates/bootstrap/password/change/default.tpl rename to templates/bootstrap/password/change/default.tpl diff --git a/public/templates/bootstrap/password/default.tpl b/templates/bootstrap/password/default.tpl similarity index 100% rename from public/templates/bootstrap/password/default.tpl rename to templates/bootstrap/password/default.tpl diff --git a/public/templates/bootstrap/password/reset/empty.tpl b/templates/bootstrap/password/reset/empty.tpl similarity index 100% rename from public/templates/bootstrap/password/reset/empty.tpl rename to templates/bootstrap/password/reset/empty.tpl diff --git a/public/templates/bootstrap/register/default.tpl b/templates/bootstrap/register/default.tpl similarity index 100% rename from public/templates/bootstrap/register/default.tpl rename to templates/bootstrap/register/default.tpl diff --git a/public/templates/bootstrap/register/disabled.tpl b/templates/bootstrap/register/disabled.tpl similarity index 100% rename from public/templates/bootstrap/register/disabled.tpl rename to templates/bootstrap/register/disabled.tpl diff --git a/public/templates/bootstrap/register/register/empty.tpl b/templates/bootstrap/register/register/empty.tpl similarity index 100% rename from public/templates/bootstrap/register/register/empty.tpl rename to templates/bootstrap/register/register/empty.tpl diff --git a/public/templates/bootstrap/statistics/blockfinder/default.tpl b/templates/bootstrap/statistics/blockfinder/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blockfinder/default.tpl rename to templates/bootstrap/statistics/blockfinder/default.tpl diff --git a/public/templates/bootstrap/statistics/blockfinder/finder_own.tpl b/templates/bootstrap/statistics/blockfinder/finder_own.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blockfinder/finder_own.tpl rename to templates/bootstrap/statistics/blockfinder/finder_own.tpl diff --git a/public/templates/bootstrap/statistics/blockfinder/finder_top.tpl b/templates/bootstrap/statistics/blockfinder/finder_top.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blockfinder/finder_top.tpl rename to templates/bootstrap/statistics/blockfinder/finder_top.tpl diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/templates/bootstrap/statistics/blocks/block_overview_time.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blocks/block_overview_time.tpl rename to templates/bootstrap/statistics/blocks/block_overview_time.tpl diff --git a/public/templates/bootstrap/statistics/blocks/block_shares_graph.tpl b/templates/bootstrap/statistics/blocks/block_shares_graph.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blocks/block_shares_graph.tpl rename to templates/bootstrap/statistics/blocks/block_shares_graph.tpl diff --git a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl b/templates/bootstrap/statistics/blocks/blocks_found_details.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl rename to templates/bootstrap/statistics/blocks/blocks_found_details.tpl diff --git a/public/templates/bootstrap/statistics/blocks/default.tpl b/templates/bootstrap/statistics/blocks/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blocks/default.tpl rename to templates/bootstrap/statistics/blocks/default.tpl diff --git a/public/templates/bootstrap/statistics/blocks/small_table.tpl b/templates/bootstrap/statistics/blocks/small_table.tpl similarity index 100% rename from public/templates/bootstrap/statistics/blocks/small_table.tpl rename to templates/bootstrap/statistics/blocks/small_table.tpl diff --git a/public/templates/bootstrap/statistics/default.tpl b/templates/bootstrap/statistics/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/default.tpl rename to templates/bootstrap/statistics/default.tpl diff --git a/public/templates/bootstrap/statistics/donors/default.tpl b/templates/bootstrap/statistics/donors/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/donors/default.tpl rename to templates/bootstrap/statistics/donors/default.tpl diff --git a/public/templates/bootstrap/statistics/donors/disabled.tpl b/templates/bootstrap/statistics/donors/disabled.tpl similarity index 100% rename from public/templates/bootstrap/statistics/donors/disabled.tpl rename to templates/bootstrap/statistics/donors/disabled.tpl diff --git a/public/templates/bootstrap/statistics/graphs/both.tpl b/templates/bootstrap/statistics/graphs/both.tpl similarity index 100% rename from public/templates/bootstrap/statistics/graphs/both.tpl rename to templates/bootstrap/statistics/graphs/both.tpl diff --git a/public/templates/bootstrap/statistics/graphs/default.tpl b/templates/bootstrap/statistics/graphs/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/graphs/default.tpl rename to templates/bootstrap/statistics/graphs/default.tpl diff --git a/public/templates/bootstrap/statistics/graphs/mine.tpl b/templates/bootstrap/statistics/graphs/mine.tpl similarity index 100% rename from public/templates/bootstrap/statistics/graphs/mine.tpl rename to templates/bootstrap/statistics/graphs/mine.tpl diff --git a/public/templates/bootstrap/statistics/graphs/pool.tpl b/templates/bootstrap/statistics/graphs/pool.tpl similarity index 100% rename from public/templates/bootstrap/statistics/graphs/pool.tpl rename to templates/bootstrap/statistics/graphs/pool.tpl diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/templates/bootstrap/statistics/pool/contributors_hashrate.tpl similarity index 100% rename from public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl rename to templates/bootstrap/statistics/pool/contributors_hashrate.tpl diff --git a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl b/templates/bootstrap/statistics/pool/contributors_shares.tpl similarity index 100% rename from public/templates/bootstrap/statistics/pool/contributors_shares.tpl rename to templates/bootstrap/statistics/pool/contributors_shares.tpl diff --git a/public/templates/bootstrap/statistics/pool/default.tpl b/templates/bootstrap/statistics/pool/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/pool/default.tpl rename to templates/bootstrap/statistics/pool/default.tpl diff --git a/public/templates/bootstrap/statistics/pool/general_stats.tpl b/templates/bootstrap/statistics/pool/general_stats.tpl similarity index 100% rename from public/templates/bootstrap/statistics/pool/general_stats.tpl rename to templates/bootstrap/statistics/pool/general_stats.tpl diff --git a/public/templates/bootstrap/statistics/round/block_stats.tpl b/templates/bootstrap/statistics/round/block_stats.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/block_stats.tpl rename to templates/bootstrap/statistics/round/block_stats.tpl diff --git a/public/templates/bootstrap/statistics/round/default.tpl b/templates/bootstrap/statistics/round/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/default.tpl rename to templates/bootstrap/statistics/round/default.tpl diff --git a/public/templates/bootstrap/statistics/round/pplns_block_stats.tpl b/templates/bootstrap/statistics/round/pplns_block_stats.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/pplns_block_stats.tpl rename to templates/bootstrap/statistics/round/pplns_block_stats.tpl diff --git a/public/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl b/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl rename to templates/bootstrap/statistics/round/pplns_block_stats_small.tpl diff --git a/public/templates/bootstrap/statistics/round/pplns_round_shares.tpl b/templates/bootstrap/statistics/round/pplns_round_shares.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/pplns_round_shares.tpl rename to templates/bootstrap/statistics/round/pplns_round_shares.tpl diff --git a/public/templates/bootstrap/statistics/round/pplns_transactions.tpl b/templates/bootstrap/statistics/round/pplns_transactions.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/pplns_transactions.tpl rename to templates/bootstrap/statistics/round/pplns_transactions.tpl diff --git a/public/templates/bootstrap/statistics/round/pplns_transactions_small.tpl b/templates/bootstrap/statistics/round/pplns_transactions_small.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/pplns_transactions_small.tpl rename to templates/bootstrap/statistics/round/pplns_transactions_small.tpl diff --git a/public/templates/bootstrap/statistics/round/round_shares.tpl b/templates/bootstrap/statistics/round/round_shares.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/round_shares.tpl rename to templates/bootstrap/statistics/round/round_shares.tpl diff --git a/public/templates/bootstrap/statistics/round/round_transactions.tpl b/templates/bootstrap/statistics/round/round_transactions.tpl similarity index 100% rename from public/templates/bootstrap/statistics/round/round_transactions.tpl rename to templates/bootstrap/statistics/round/round_transactions.tpl diff --git a/public/templates/bootstrap/statistics/uptime/default.tpl b/templates/bootstrap/statistics/uptime/default.tpl similarity index 100% rename from public/templates/bootstrap/statistics/uptime/default.tpl rename to templates/bootstrap/statistics/uptime/default.tpl diff --git a/public/templates/bootstrap/tac/content.tpl b/templates/bootstrap/tac/content.tpl similarity index 100% rename from public/templates/bootstrap/tac/content.tpl rename to templates/bootstrap/tac/content.tpl diff --git a/public/templates/bootstrap/tac/default.tpl b/templates/bootstrap/tac/default.tpl similarity index 100% rename from public/templates/bootstrap/tac/default.tpl rename to templates/bootstrap/tac/default.tpl diff --git a/public/templates/cache/README.md b/templates/cache/README.md similarity index 100% rename from public/templates/cache/README.md rename to templates/cache/README.md diff --git a/public/templates/compile/README.md b/templates/compile/README.md similarity index 100% rename from public/templates/compile/README.md rename to templates/compile/README.md diff --git a/public/templates/mail/contactform/body.tpl b/templates/mail/contactform/body.tpl similarity index 100% rename from public/templates/mail/contactform/body.tpl rename to templates/mail/contactform/body.tpl diff --git a/public/templates/mail/global/footer.tpl b/templates/mail/global/footer.tpl similarity index 100% rename from public/templates/mail/global/footer.tpl rename to templates/mail/global/footer.tpl diff --git a/public/templates/mail/global/header.tpl b/templates/mail/global/header.tpl similarity index 100% rename from public/templates/mail/global/header.tpl rename to templates/mail/global/header.tpl diff --git a/public/templates/mail/invitations/body.tpl b/templates/mail/invitations/body.tpl similarity index 100% rename from public/templates/mail/invitations/body.tpl rename to templates/mail/invitations/body.tpl diff --git a/public/templates/mail/newsletter/body.tpl b/templates/mail/newsletter/body.tpl similarity index 100% rename from public/templates/mail/newsletter/body.tpl rename to templates/mail/newsletter/body.tpl diff --git a/public/templates/mail/notifications/account_edit.tpl b/templates/mail/notifications/account_edit.tpl similarity index 100% rename from public/templates/mail/notifications/account_edit.tpl rename to templates/mail/notifications/account_edit.tpl diff --git a/public/templates/mail/notifications/change_pw.tpl b/templates/mail/notifications/change_pw.tpl similarity index 100% rename from public/templates/mail/notifications/change_pw.tpl rename to templates/mail/notifications/change_pw.tpl diff --git a/public/templates/mail/notifications/error.tpl b/templates/mail/notifications/error.tpl similarity index 100% rename from public/templates/mail/notifications/error.tpl rename to templates/mail/notifications/error.tpl diff --git a/public/templates/mail/notifications/idle_worker.tpl b/templates/mail/notifications/idle_worker.tpl similarity index 100% rename from public/templates/mail/notifications/idle_worker.tpl rename to templates/mail/notifications/idle_worker.tpl diff --git a/public/templates/mail/notifications/locked.tpl b/templates/mail/notifications/locked.tpl similarity index 100% rename from public/templates/mail/notifications/locked.tpl rename to templates/mail/notifications/locked.tpl diff --git a/public/templates/mail/notifications/new_block.tpl b/templates/mail/notifications/new_block.tpl similarity index 100% rename from public/templates/mail/notifications/new_block.tpl rename to templates/mail/notifications/new_block.tpl diff --git a/public/templates/mail/notifications/payout.tpl b/templates/mail/notifications/payout.tpl similarity index 100% rename from public/templates/mail/notifications/payout.tpl rename to templates/mail/notifications/payout.tpl diff --git a/public/templates/mail/notifications/success_login.tpl b/templates/mail/notifications/success_login.tpl similarity index 100% rename from public/templates/mail/notifications/success_login.tpl rename to templates/mail/notifications/success_login.tpl diff --git a/public/templates/mail/notifications/withdraw_funds.tpl b/templates/mail/notifications/withdraw_funds.tpl similarity index 100% rename from public/templates/mail/notifications/withdraw_funds.tpl rename to templates/mail/notifications/withdraw_funds.tpl diff --git a/public/templates/mail/password/reset.tpl b/templates/mail/password/reset.tpl similarity index 100% rename from public/templates/mail/password/reset.tpl rename to templates/mail/password/reset.tpl diff --git a/public/templates/mail/pin/reset.tpl b/templates/mail/pin/reset.tpl similarity index 100% rename from public/templates/mail/pin/reset.tpl rename to templates/mail/pin/reset.tpl diff --git a/public/templates/mail/register/confirm_email.tpl b/templates/mail/register/confirm_email.tpl similarity index 100% rename from public/templates/mail/register/confirm_email.tpl rename to templates/mail/register/confirm_email.tpl diff --git a/public/templates/mail/subject.tpl b/templates/mail/subject.tpl similarity index 100% rename from public/templates/mail/subject.tpl rename to templates/mail/subject.tpl diff --git a/upgrade/definitions/0.0.9_to_0.0.10.inc.php b/upgrade/definitions/0.0.9_to_0.0.10.inc.php new file mode 100755 index 00000000..c39aad61 --- /dev/null +++ b/upgrade/definitions/0.0.9_to_0.0.10.inc.php @@ -0,0 +1,52 @@ +getValue('DB_VERSION'); // Our actual version installed + + // Upgrade specific variables + $aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.10' WHERE name = 'DB_VERSION'"; + + echo '- Starting configuration migration into new location' . PHP_EOL; + $files = glob(BASEPATH . '../public/include/config/*'); + foreach ($files as $configFile) { + echo '- Moving ' . basename($configFile) . PHP_EOL; + system('mv ' . $configFile . ' ../include/config/'); + } + + echo '- Starting folder cleanup' . PHP_EOL; + $folders = array(BASEPATH . '../public/include/config', BASEPATH . '../public/include'); + foreach ($folders as $folderPath) { + if (file_exists($folderPath)) { + echo '- Removing ' . $folderPath . PHP_EOL; + $files = glob($folderPath . '/*'); + if (count($files) == 0) { + system('rmdir ' . $folderPath); + } else { + echo '! folder not empty, not removed' . PHP_EOL; + } + } + } + + echo '! Use `git status` to clenaup any remaining left over folders' . PHP_EOL; + + if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) { + // Run the upgrade + echo '- Starting database migration to version ' . $db_version_new . PHP_EOL; + foreach ($aSql as $sql) { + echo '- Preparing: ' . $sql . PHP_EOL; + $stmt = $mysqli->prepare($sql); + if ($stmt && $stmt->execute()) { + echo '- success' . PHP_EOL; + } else { + echo '! failed: ' . $mysqli->error . PHP_EOL; + exit(1); + } + } + } +} +?> diff --git a/upgrade/shared.inc.php b/upgrade/shared.inc.php index 0f0638cb..fbce4bc8 100644 --- a/upgrade/shared.inc.php +++ b/upgrade/shared.inc.php @@ -18,9 +18,8 @@ limitations under the License. */ -// MODIFY THIS // We need to find our include files so set this properly -define("BASEPATH", "../public/"); +define('BASEPATH', dirname(__FILE__) . '/'); /***************************************************** * No need to change beyond this point * @@ -40,12 +39,6 @@ if (SECHASH_CHECK) { } // Include our configuration (holding defines for the requires) -require_once(BASEPATH . 'include/config/global.inc.dist.php'); -require_once(BASEPATH . 'include/config/global.inc.php'); - -require_once(BASEPATH . 'include/config/security.inc.dist.php'); -@include_once(BASEPATH . 'include/config/security.inc.php'); - -require_once(BASEPATH . 'include/bootstrap.php'); -require_once(BASEPATH . 'include/version.inc.php'); +require_once(BASEPATH . '../include/bootstrap.php'); +require_once(BASEPATH . '../include/version.inc.php'); ?>