From 7f1c1eba0f79fa291b8ef9b9060bc310466a536b Mon Sep 17 00:00:00 2001
From: Craig <craig@airy>
Date: Sat, 16 Jan 2016 15:40:03 +1100
Subject: [PATCH 1/2] changed all refs to /admin to use 'ADMIN' constant

---
 admin/index.php                               | 12 ++++++++--
 admin/themes/default/index.template.php       | 12 +++++-----
 admin/themes/default/login.template.php       |  6 ++---
 boot/defines.php                              |  4 +++-
 engine/Plugin/Stylesheet.php                  |  2 +-
 install.php                                   |  2 +-
 plugins/box/backup/backup.admin.php           |  6 ++---
 .../box/backup/views/backend/index.view.php   |  2 +-
 .../box/filesmanager/filesmanager.admin.php   | 24 +++++++++----------
 .../information/views/backend/index.view.php  | 17 +++++++++++--
 .../box/pages/views/backend/index.view.php    |  2 +-
 plugins/box/plugins/plugins.admin.php         |  4 ++--
 .../box/plugins/views/backend/index.view.php  |  2 +-
 plugins/box/themes/themes.plugin.php          |  9 +++++--
 .../box/users/views/frontend/profile.view.php |  2 +-
 .../users/views/frontend/userspanel.view.php  |  2 +-
 16 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 56418237..8d4ea327 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -11,10 +11,18 @@
  * file that was distributed with this source code.
  */
 
+/** 
+ * Define __DIR__ constant for PHP 5.2.x
+ */
+if ( ! defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
 
 // Main engine defines
 define('DS', DIRECTORY_SEPARATOR);
-define('ROOT', rtrim(str_replace(array('admin'), array(''), dirname(__FILE__)), '\\/'));
+define('ROOT', rtrim(dirname(__DIR__), '\\/')); // eg '/home/user/public_html'
+define('ADMIN', basename(__DIR__)); // eg 'admin'
 define('BACKEND', true);
 define('MONSTRA_ACCESS', true);
 
@@ -131,7 +139,7 @@
         Notification::set('reset_password', 'reset_password');
 
         // Redirect to password-reset page
-        Request::redirect(Site::url().'/admin');
+        Request::redirect(Site::url().'/'.ADMIN.'');
     }
 
     Notification::setNow('reset_password', 'reset_password');
diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php
index 6a6c5d45..dd6d9ddd 100644
--- a/admin/themes/default/index.template.php
+++ b/admin/themes/default/index.template.php
@@ -21,7 +21,7 @@
     <?php Stylesheet::add('public/assets/css/chocolat.css', 'backend', 2); ?>
     <?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
     <?php Stylesheet::add('public/assets/css/icheck-blue.css', 'backend', 4); ?>
-    <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
+    <?php Stylesheet::add(ADMIN.'/themes/default/css/default.css', 'backend', 5); ?>
     <?php Stylesheet::load(); ?>
 
     <!-- JavaScripts -->
@@ -31,7 +31,7 @@
     <script src="<?php echo Site::url(); ?>/public/assets/js/icheck.min.js"></script>    
     <?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?>
     <?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>
-    <?php Javascript::add('admin/themes/default/js/default.js', 'backend', 5); ?>
+    <?php Javascript::add(ADMIN.'/themes/default/js/default.js', 'backend', 5); ?>
     <?php Javascript::load(); ?>
 
     <?php Action::run('admin_header'); ?>
@@ -74,12 +74,12 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="<?php echo Site::url(); ?>/admin/index.php?id=dashboard">MONSTRA</a>
+            <a class="navbar-brand" href="<?php echo Site::url().'/'.ADMIN; ?>/index.php?id=dashboard">MONSTRA</a>
           </div>
 
           <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">      
             <ul class="nav navbar-nav">          
-              <li<?php if (Request::get('id') == 'dashboard') { ?> class="active"<?php } ?>><a href="<?php echo Site::url(); ?>/admin/index.php?id=dashboard"><?php echo __('Dashboard', 'dashboard'); ?></a></li>              
+              <li<?php if (Request::get('id') == 'dashboard') { ?> class="active"<?php } ?>><a href="<?php echo Site::url().'/'.ADMIN; ?>/index.php?id=dashboard"><?php echo __('Dashboard', 'dashboard'); ?></a></li>              
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Content', 'pages'); ?> <b class="caret"></b></a>
                 <ul class="dropdown-menu">
@@ -117,8 +117,8 @@
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo Session::get('user_login'); ?> <img src="<?php echo Users::getGravatarURL(Session::get('user_email'), 28); ?>" alt=""> <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="<?php echo Site::url(); ?>/admin/index.php?id=users&action=edit&user_id=<?php echo Session::get('user_id'); ?>"><?php echo __('Profile', 'users')?></a></li>
-                  <li><a href="<?php echo Site::url(); ?>/admin/?logout=do"><?php echo __('Log Out', 'users'); ?></a></li>              
+                  <li><a href="<?php echo Site::url().'/'.ADMIN; ?>/index.php?id=users&action=edit&user_id=<?php echo Session::get('user_id'); ?>"><?php echo __('Profile', 'users')?></a></li>
+                  <li><a href="<?php echo Site::url().'/'.ADMIN; ?>/?logout=do"><?php echo __('Log Out', 'users'); ?></a></li>              
                 </ul>
               </li>
             </ul>        
diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php
index d98c5034..67e97d47 100644
--- a/admin/themes/default/login.template.php
+++ b/admin/themes/default/login.template.php
@@ -14,7 +14,7 @@
         <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger-theme-flat.css" type="text/css" />
         <?php Stylesheet::add('public/assets/css/bootstrap-lightbox.css', 'backend', 2); ?>
         <?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
-        <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
+        <?php Stylesheet::add(ADMIN.'/themes/default/css/default.css', 'backend', 5); ?>
         <?php Stylesheet::load(); ?>
 
         <!-- JavaScripts -->
@@ -24,7 +24,7 @@
         <script src="<?php echo Site::url(); ?>/public/assets/js/messenger-theme-flat.js"></script>        
         <?php Javascript::add('public/assets/js/bootstrap-lightbox.js', 'backend', 3); ?>
         <?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>
-        <?php Javascript::add('admin/themes/default/js/default.js', 'backend', 5); ?>
+        <?php Javascript::add(ADMIN.'/themes/default/js/default.js', 'backend', 5); ?>
         <?php Javascript::load(); ?>
 
         <script type="text/javascript">
@@ -68,7 +68,7 @@
 
         <div class="container form-signin">
 
-            <div class="text-center"><a class="brand" href="<?php echo Option::get('siteurl'); ?>/admin"><img src="<?php echo Option::get('siteurl'); ?>/public/assets/img/monstra-logo-256px.png" alt="monstra" /></a></div>
+            <div class="text-center"><a class="brand" href="<?php echo Option::get('siteurl').'/'.ADMIN; ?>"><img src="<?php echo Option::get('siteurl'); ?>/public/assets/img/monstra-logo-256px.png" alt="monstra" /></a></div>
             <div class="administration-area well">
                 <div>
                     <form method="post">
diff --git a/boot/defines.php b/boot/defines.php
index 180ada19..78956ded 100644
--- a/boot/defines.php
+++ b/boot/defines.php
@@ -12,7 +12,9 @@
 /**
  * The filesystem path to the admin 'themes' folder
  */
-define('THEMES_ADMIN', ROOT . DS . 'admin' . DS . 'themes');
+if (!defined('ADMIN'))
+	define('ADMIN', 'admin'); // change this if you use the members area in the front webite
+define('THEMES_ADMIN', ROOT . DS . 'admin' . DS . 'themes'); 
 
 /**
  * The filesystem path to the 'plugins' folder
diff --git a/engine/Plugin/Stylesheet.php b/engine/Plugin/Stylesheet.php
index 214374da..a346e1af 100644
--- a/engine/Plugin/Stylesheet.php
+++ b/engine/Plugin/Stylesheet.php
@@ -139,7 +139,7 @@ public static function parseVariables($frontend_buffer)
                                  '@theme_admin_url'),
                            array(Option::get('siteurl'),
                                  Option::get('siteurl').'/public/themes/'.Option::get('theme_site_name'),
-                                 Option::get('siteurl').'/admin/themes/'.Option::get('theme_admin_name')),
+                                 Option::get('siteurl').'/'.ADMIN.'/themes/'.Option::get('theme_admin_name')),
                            $frontend_buffer);
     }
 
diff --git a/install.php b/install.php
index 8188e379..c63cc3df 100644
--- a/install.php
+++ b/install.php
@@ -168,7 +168,7 @@
         <link rel="icon" href="<?php echo $site_url; ?>/favicon.ico" type="image/x-icon" />
         <link rel="shortcut icon" href="<?php echo $site_url; ?>/favicon.ico" type="image/x-icon" />
         <link rel="stylesheet" href="<?php echo $site_url; ?>/public/assets/css/bootstrap.css" media="all" type="text/css" />
-        <link rel="stylesheet" href="<?php echo $site_url; ?>/admin/themes/default/css/default.css" media="all" type="text/css" />
+        <link rel="stylesheet" href="<?php echo $site_url.'/'.ADMIN; ?>/themes/default/css/default.css" media="all" type="text/css" />
 
         <style>
 
diff --git a/plugins/box/backup/backup.admin.php b/plugins/box/backup/backup.admin.php
index de13814d..4a5b6c9b 100755
--- a/plugins/box/backup/backup.admin.php
+++ b/plugins/box/backup/backup.admin.php
@@ -41,7 +41,7 @@ public static function main()
                     Notification::set('error', __('Backup was not created', 'backup'));
                 }
 
-                Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
+                Request::redirect(Option::get('siteurl').'/'.ADMIN.'/index.php?id=backup');
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -58,7 +58,7 @@ public static function main()
                     Notification::set('error', __('Backup was not deleted', 'backup'));
                 }
                 
-                Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
+                Request::redirect(Option::get('siteurl').'/'.ADMIN.'/index.php?id=backup');
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -91,7 +91,7 @@ public static function main()
                     Notification::set('error', __('Backup was not restored', 'backup'));
                 }
 
-                Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
+                Request::redirect(Option::get('siteurl').'/'.ADMIN.'/index.php?id=backup');
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
diff --git a/plugins/box/backup/views/backend/index.view.php b/plugins/box/backup/views/backend/index.view.php
index d8d0dd6a..6591572c 100755
--- a/plugins/box/backup/views/backend/index.view.php
+++ b/plugins/box/backup/views/backend/index.view.php
@@ -31,7 +31,7 @@
     <tr>
         <td>
             <?php $name = strtotime(str_replace('-', '', basename($backup, '.zip'))); ?>
-            <?php echo Html::anchor(Date::format($name, 'F jS, Y - g:i A'), Option::get('siteurl').'/admin/index.php?id=backup&download='.$backup.'&token='.Security::token()); ?>
+            <?php echo Html::anchor(Date::format($name, 'F jS, Y - g:i A'), Option::get('siteurl').'/'.ADMIN.'/index.php?id=backup&download='.$backup.'&token='.Security::token()); ?>
         </td>
         <td class="visible-lg hidden-xs"><?php echo Number::byteFormat(filesize(ROOT . DS . 'backups' . DS . $backup)); ?></td>
         <td>
diff --git a/plugins/box/filesmanager/filesmanager.admin.php b/plugins/box/filesmanager/filesmanager.admin.php
index 7157ce4d..911d2a84 100755
--- a/plugins/box/filesmanager/filesmanager.admin.php
+++ b/plugins/box/filesmanager/filesmanager.admin.php
@@ -36,25 +36,25 @@ public static function main()
         // Add slash if not exists
         if (substr($path, -1, 1) != '/') {
             $path .= '/';
-            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
         }
 
         // Upload corectly!
         if ($path == 'uploads' || $path == 'uploads//') {
             $path = 'uploads/';
-            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
         }
 
         // Only 'uploads' folder!
         if (strpos($path, 'uploads') === false) {
             $path = 'uploads/';
-            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
         }
 
         // Set default path value if path is empty
         if ($path == '') {
             $path = 'uploads/';
-            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
         }
 
         $files_path = ROOT . DS . 'public' . DS . $path;
@@ -73,7 +73,7 @@ public static function main()
                 } else {
                     Notification::set('error', __('File was not deleted', 'filesmanager'));
                 }
-                Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -92,7 +92,7 @@ public static function main()
                     Notification::set('error', __('Directory was not deleted', 'filesmanager'));
                 }
                 
-                Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
                 
                     
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
@@ -111,7 +111,7 @@ public static function main()
 
                 if (empty($rename_to)) {
                     Notification::set('error', __('Can not be empty', 'filesmanager'));
-                    Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                    Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
                 }
 
                 $ext = ($rename_type === 'file') ? '.'. File::ext($rename_from) : '';
@@ -119,12 +119,12 @@ public static function main()
 
                 if (is_dir($rename_to)) {
                     Notification::set('error', __('Directory exists', 'filesmanager'));
-                    Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                    Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
                 }
 
                 if (is_file($rename_to)) {
                     Notification::set('error', __('File exists', 'filesmanager'));
-                    Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                    Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
                 }
 
                 $success = rename($files_path.$rename_from, $rename_to);
@@ -134,7 +134,7 @@ public static function main()
                 } else {
                     Notification::set('error', __('Failure', 'filesmanager'));
                 }
-                Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -169,7 +169,7 @@ public static function main()
                 if (Request::post('dragndrop')) {
                     Request::shutdown();
                 } else {
-                    Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
+                    Request::redirect($site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path);
                 }
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -239,7 +239,7 @@ public static function main()
                 ->assign('upload_max_filesize', FilesmanagerAdmin::uploadSize())
                 ->assign('files_path', $files_path)
                 ->assign('fileuploader', array(
-                    'uploadUrl' => $site_url.'/admin/index.php?id=filesmanager&path='.$path,
+                    'uploadUrl' => $site_url.'/'.ADMIN.'/index.php?id=filesmanager&path='.$path,
                     'csrf'      => Security::token(),
                     'errorMsg'  => __('Upload server error', 'filesmanager')
                 ))->display();
diff --git a/plugins/box/information/views/backend/index.view.php b/plugins/box/information/views/backend/index.view.php
index 0365d4ae..a50782fe 100644
--- a/plugins/box/information/views/backend/index.view.php
+++ b/plugins/box/information/views/backend/index.view.php
@@ -121,8 +121,8 @@
                         <td><?php if (Dir::writable(PLUGINS)) { ?><span class="badge badge-success"><?php echo __('Writable', 'information'); ?></span><?php } else { ?><span class="badge badge-error"><?php echo __('Unwritable', 'information'); ?></span><?php } ?></td>
                     </tr>
                     <tr>
-                        <td><?php echo ROOT . DS . 'admin' ?></td>
-                        <td><?php if (Dir::writable(ROOT . DS . 'admin')) { ?><span class="badge badge-success"><?php echo __('Writable', 'information'); ?></span><?php } else { ?><span class="badge badge-error"><?php echo __('Unwritable', 'information'); ?></span><?php } ?></td>
+                        <td><?php echo ROOT . DS . ADMIN ?></td>
+                        <td><?php if (Dir::writable(ROOT . DS . ADMIN)) { ?><span class="badge badge-success"><?php echo __('Writable', 'information'); ?></span><?php } else { ?><span class="badge badge-error"><?php echo __('Unwritable', 'information'); ?></span><?php } ?></td>
                     </tr>
                 </tbody>
             </table>
@@ -152,6 +152,19 @@
                             <td><?php echo __('The Monstra index.php file has been found to be writable. We would advise you to remove all write permissions. <br>You can do this on unix systems with: <code>chmod a-w :path</code>', 'information', array(':path' => ROOT . DS . 'index.php')); ?></td>
                         </tr>
                     <?php } ?>
+                    <?php if (Dir::exists(ROOT . DS . 'admin')) { 
+                        $new_admin = 'admin' . bin2hex(openssl_random_pseudo_bytes(2));
+                        ?>
+                        <tr>
+                            <td><span class="badge badge-error" style="padding-left:5px; padding-right:5px;"><b>!</b></span> </td>
+                            <td><?php echo __('The Monstra admin folder should be renamed to something else. We suggest <code>:name</code> or something memorable.<br>You can rename the folder on unix systems with: <code>mv :pathadmin :path:name</code> <br> You will then access this admin website via <code>:url</code><br><br>You may also need to update <code>:defines</code> by adding <code>:newdefine</code>, particularly if you have a members area.', 'information', 
+                                array(':path' => ROOT . DS, 
+                                    ':name' => $new_admin, 
+                                    ':url' => Option::get('siteurl').'/'.$new_admin, 
+                                    ':defines' => ROOT . DS . 'boot' . DS . 'defines.php',
+                                    ':newdefine' => 'if (!defined(\'ADMIN\')) define(\'ADMIN\', \''.$new_admin.'\');')); ?></td>
+                        </tr>
+                    <?php } ?>
                     <?php if (Monstra::$environment == Monstra::DEVELOPMENT) { ?>
                         <tr>
                             <td><span class="badge badge-warning" style="padding-left:5px; padding-right:5px;"><b>!</b></span> </td>
diff --git a/plugins/box/pages/views/backend/index.view.php b/plugins/box/pages/views/backend/index.view.php
index a8e9a4e0..b1cf6016 100755
--- a/plugins/box/pages/views/backend/index.view.php
+++ b/plugins/box/pages/views/backend/index.view.php
@@ -109,5 +109,5 @@
 </div>
 
 <form>
-    <input type="hidden" name="url" value="<?php echo Option::get('siteurl'); ?>/admin/index.php?id=pages">
+    <input type="hidden" name="url" value="<?php echo Option::get('siteurl').'/'.ADMIN; ?>/index.php?id=pages">
 </form>
diff --git a/plugins/box/plugins/plugins.admin.php b/plugins/box/plugins/plugins.admin.php
index 74164669..9b60a852 100755
--- a/plugins/box/plugins/plugins.admin.php
+++ b/plugins/box/plugins/plugins.admin.php
@@ -174,7 +174,7 @@ public static function main()
                 if (Request::post('dragndrop')) {
                     Request::shutdown();
                 } else {
-                    Request::redirect($site_url.'/admin/index.php?id=plugins#installnew');
+                    Request::redirect($site_url.'/'.ADMIN.'/index.php?id=plugins#installnew');
                 }
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -219,7 +219,7 @@ public static function main()
                 ->assign('plugins_to_intall', $plugins_to_intall)
                 ->assign('_users_plugins', $_users_plugins)
                 ->assign('fileuploader', array(
-                    'uploadUrl' => $site_url.'/admin/index.php?id=plugins',
+                    'uploadUrl' => $site_url.'/'.ADMIN.'/index.php?id=plugins',
                     'csrf'      => Security::token(),
                     'errorMsg'  => __('Upload server error', 'filesmanager')
                 ))
diff --git a/plugins/box/plugins/views/backend/index.view.php b/plugins/box/plugins/views/backend/index.view.php
index 2c7bddc3..e8b4cae4 100755
--- a/plugins/box/plugins/views/backend/index.view.php
+++ b/plugins/box/plugins/views/backend/index.view.php
@@ -152,7 +152,7 @@
             $.ajax({
                 type:"post",
                 data:"readme_plugin="+$(this).attr('readme_plugin'),
-                url: "<?php echo Site::url(); ?>/admin/index.php?id=plugins",
+                url: "<?php echo Site::url().'/'.ADMIN; ?>/index.php?id=plugins",
                 success: function(data){
                     $('#readme .modal-body').html(data);
                 }
diff --git a/plugins/box/themes/themes.plugin.php b/plugins/box/themes/themes.plugin.php
index 76c116a0..1ab464d2 100644
--- a/plugins/box/themes/themes.plugin.php
+++ b/plugins/box/themes/themes.plugin.php
@@ -40,11 +40,16 @@ public static function getAdminThemes()
     {
         $themes_folders = array();
 
+        $themes_dir = THEMES_ADMIN;
+        if (ADMIN!='admin' && THEMES_ADMIN==ROOT . DS . 'admin' . DS . 'themes')
+            // admin folder changed, but not the THEMES_ADMIN definition
+            $themes_dir = ROOT . DS . ADMIN . DS . 'themes';
+
         // Get all themes folders
-        $_themes_admin_folders = Dir::scan(THEMES_ADMIN);
+        $_themes_admin_folders = Dir::scan($themes_dir);
 
         // Create an array of valid themes folders
-        foreach($_themes_admin_folders as $folder) if (File::exists(THEMES_ADMIN . DS . $folder . DS . 'index.template.php')) $__themes_admin_folders[] = $folder;
+        foreach($_themes_admin_folders as $folder) if (File::exists($themes_dir . DS . $folder . DS . 'index.template.php')) $__themes_admin_folders[] = $folder;
         foreach($__themes_admin_folders as $theme) $themes[$theme] = $theme;
 
         return $themes;
diff --git a/plugins/box/users/views/frontend/profile.view.php b/plugins/box/users/views/frontend/profile.view.php
index 200ba132..89239868 100644
--- a/plugins/box/users/views/frontend/profile.view.php
+++ b/plugins/box/users/views/frontend/profile.view.php
@@ -12,7 +12,7 @@
 <?php if (Users::isLoged()) { ?>
 <br>
 <a href="<?php echo Site::url(); ?>/users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
-<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
+<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url().'/'.ADMIN; ?>"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
 <a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a>
 <?php } ?>
 <?php } else { echo __('This users doesnt exists', 'users'); } ?>
diff --git a/plugins/box/users/views/frontend/userspanel.view.php b/plugins/box/users/views/frontend/userspanel.view.php
index 180f1afd..0ab37e1c 100644
--- a/plugins/box/users/views/frontend/userspanel.view.php
+++ b/plugins/box/users/views/frontend/userspanel.view.php
@@ -4,7 +4,7 @@
         <ul class="dropdown-menu">
             <li><a href="<?php echo Site::url(); ?>/users/<?php echo Session::get('user_id'); ?>"><?php echo __('Profile', 'users'); ?></a></li>
             <?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?>
-                <li><a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a></li>
+                <li><a href="<?php echo Site::url().'/'.ADMIN; ?>"><?php echo __('Administration', 'system'); ?></a></li>
             <?php } ?>
             <li><a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a></li>
         </ul>

From 36f667fcf7a6cd6d9d94dbe5c70c44b2b7a582d1 Mon Sep 17 00:00:00 2001
From: Craig <craig@airy>
Date: Sat, 16 Jan 2016 16:37:11 +1100
Subject: [PATCH 2/2] admin folder rename fixes to include edge case with
 upgrading websites (ADMIN not defined in defines.php, but may be needed in
 frontend)

---
 boot/defines.php   | 4 ++--
 engine/Monstra.php | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/boot/defines.php b/boot/defines.php
index 78956ded..18f4154a 100644
--- a/boot/defines.php
+++ b/boot/defines.php
@@ -13,8 +13,8 @@
  * The filesystem path to the admin 'themes' folder
  */
 if (!defined('ADMIN'))
-	define('ADMIN', 'admin'); // change this if you use the members area in the front webite
-define('THEMES_ADMIN', ROOT . DS . 'admin' . DS . 'themes'); 
+	define('ADMIN', 'admin'); // change this if you use the members area in the front website
+define('THEMES_ADMIN', ROOT . DS . ADMIN . DS . 'themes'); 
 
 /**
  * The filesystem path to the 'plugins' folder
diff --git a/engine/Monstra.php b/engine/Monstra.php
index ca627c3e..eb37247e 100644
--- a/engine/Monstra.php
+++ b/engine/Monstra.php
@@ -263,6 +263,11 @@ protected static function loadDefines()
         } else {
             throw new RuntimeException("The defines file does not exist.");
         }
+        
+        // a last gasp catch-all to ensure that any front-end systems won't cause an exception, but will simply fail to use the correct URL
+        // (This is normally in defines.php)
+        if (!defined('ADMIN')) 
+            define('ADMIN', 'admin'); 
     }
 
     /**