diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/_sakura/changelog.json b/_sakura/changelog.json old mode 100644 new mode 100755 diff --git a/_sakura/components/Bans.php b/_sakura/components/Bans.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Comments.php b/_sakura/components/Comments.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Configuration.php b/_sakura/components/Configuration.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Database.php b/_sakura/components/Database.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Forum.php b/_sakura/components/Forum.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Hashing.php b/_sakura/components/Hashing.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Main.php b/_sakura/components/Main.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Manage.php b/_sakura/components/Manage.php old mode 100644 new mode 100755 diff --git a/_sakura/components/News.php b/_sakura/components/News.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Payments.php b/_sakura/components/Payments.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Permissions.php b/_sakura/components/Permissions.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Rank.php b/_sakura/components/Rank.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Session.php b/_sakura/components/Session.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Sessions.php b/_sakura/components/Sessions.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Templates.php b/_sakura/components/Templates.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Upload.php b/_sakura/components/Upload.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Urls.php b/_sakura/components/Urls.php old mode 100644 new mode 100755 diff --git a/_sakura/components/User.php b/_sakura/components/User.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Users.php b/_sakura/components/Users.php old mode 100644 new mode 100755 diff --git a/_sakura/components/Whois.php b/_sakura/components/Whois.php old mode 100644 new mode 100755 diff --git a/_sakura/components/database/mysql.php b/_sakura/components/database/mysql.php old mode 100644 new mode 100755 diff --git a/_sakura/composer.json b/_sakura/composer.json old mode 100644 new mode 100755 diff --git a/_sakura/composer.lock b/_sakura/composer.lock old mode 100644 new mode 100755 diff --git a/_sakura/config/cloudflare.ipv4 b/_sakura/config/cloudflare.ipv4 old mode 100644 new mode 100755 diff --git a/_sakura/config/cloudflare.ipv6 b/_sakura/config/cloudflare.ipv6 old mode 100644 new mode 100755 diff --git a/_sakura/config/config.example.ini b/_sakura/config/config.example.ini old mode 100644 new mode 100755 diff --git a/_sakura/config/iso3166.json b/_sakura/config/iso3166.json old mode 100644 new mode 100755 diff --git a/_sakura/config/whois.json b/_sakura/config/whois.json old mode 100644 new mode 100755 diff --git a/_sakura/cron.php b/_sakura/cron.php old mode 100644 new mode 100755 diff --git a/_sakura/sakura.php b/_sakura/sakura.php old mode 100644 new mode 100755 index cb062d7..1cd2ecd --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -104,6 +104,12 @@ $urls = new Urls(); $templateName = defined('SAKURA_MANAGE') ? Configuration::getConfig('manage_style') : +( + isset($currentUser->data['user_data']['userOptions']['useMisaki']) && + $currentUser->data['user_data']['userOptions']['useMisaki'] && + $currentUser->checkPermission('SITE', 'ALTER_PROFILE') +) ? +'misaki' : Configuration::getConfig('site_style'); if (!defined('SAKURA_NO_TPL')) { diff --git a/_sakura/templates/broomcloset/global/master.tpl b/_sakura/templates/broomcloset/global/master.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/broomcloset/global/restricted.tpl b/_sakura/templates/broomcloset/global/restricted.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/broomcloset/pages/general.configuration.tpl b/_sakura/templates/broomcloset/pages/general.configuration.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/broomcloset/pages/index.dashboard.tpl b/_sakura/templates/broomcloset/pages/index.dashboard.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/broomcloset/pages/index.error.tpl b/_sakura/templates/broomcloset/pages/index.error.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/broomcloset/template.ini b/_sakura/templates/broomcloset/template.ini old mode 100644 new mode 100755 diff --git a/_sakura/templates/changeLog.tpl b/_sakura/templates/changeLog.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/htmlEmail.tpl b/_sakura/templates/htmlEmail.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/mio/elements/newsPost.tpl b/_sakura/templates/mio/elements/newsPost.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/mio/global/footer.tpl b/_sakura/templates/mio/global/footer.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/mio/global/header.tpl b/_sakura/templates/mio/global/header.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/mio/main/index.tpl b/_sakura/templates/mio/main/index.tpl old mode 100644 new mode 100755 diff --git a/_sakura/templates/mio/template.ini b/_sakura/templates/mio/template.ini old mode 100644 new mode 100755 diff --git a/_sakura/templates/misaki/elements/newsPost.tpl b/_sakura/templates/misaki/elements/newsPost.tpl old mode 100644 new mode 100755 index 5e1e5f0..c5a10e3 --- a/_sakura/templates/misaki/elements/newsPost.tpl +++ b/_sakura/templates/misaki/elements/newsPost.tpl @@ -1,18 +1,18 @@ -