Changeset:
33f7f9a44ca6
https://sourceforge.net/p/mrbs/hg-code/ci/33f7f9a44ca69035549932335a936431645ebe90
Author:
Campbell Morrison <[email protected]>
Date:
Fri Oct 28 11:38:44 2016 +0100
Log message:
Moved joomla.inc and wordpress.inc out of main directory
diffstat:
web/auth/auth_joomla.inc | 2 +-
web/auth/auth_wordpress.inc | 2 +-
web/auth/cms/joomla.inc | 10 ++++++++++
web/auth/cms/wordpress.inc | 4 ++++
web/joomla.inc | 10 ----------
web/session/session_joomla.inc | 2 +-
web/session/session_wordpress.inc | 2 +-
web/wordpress.inc | 4 ----
8 files changed, 18 insertions(+), 18 deletions(-)
diffs (92 lines):
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/auth/auth_joomla.inc
--- a/web/auth/auth_joomla.inc Fri Oct 28 11:29:39 2016 +0100
+++ b/web/auth/auth_joomla.inc Fri Oct 28 11:38:44 2016 +0100
@@ -1,7 +1,7 @@
<?php
namespace MRBS;
-require_once MRBS_ROOT . '/joomla.inc';
+require_once MRBS_ROOT . '/auth/cms/joomla.inc';
/* authGetUserLevel($user)
*
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/auth/auth_wordpress.inc
--- a/web/auth/auth_wordpress.inc Fri Oct 28 11:29:39 2016 +0100
+++ b/web/auth/auth_wordpress.inc Fri Oct 28 11:38:44 2016 +0100
@@ -1,7 +1,7 @@
<?php
namespace MRBS;
-require_once MRBS_ROOT . '/wordpress.inc';
+require_once MRBS_ROOT . '/auth/cms/wordpress.inc';
/* authValidateUser($user, $pass)
*
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/auth/cms/joomla.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/auth/cms/joomla.inc Fri Oct 28 11:38:44 2016 +0100
@@ -0,0 +1,10 @@
+<?php
+
+global $auth;
+
+define('_JEXEC', 1);
+define('JPATH_BASE', realpath(MRBS_ROOT . DS . $auth['joomla']['rel_path']));
+
+require_once JPATH_BASE . DS . 'includes' . DS . 'defines.php';
+require_once JPATH_BASE . DS . 'includes' . DS . 'framework.php';
+
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/auth/cms/wordpress.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/auth/cms/wordpress.inc Fri Oct 28 11:38:44 2016 +0100
@@ -0,0 +1,4 @@
+<?php
+
+define('WP_USE_THEMES', false);
+require_once MRBS_ROOT . '/'. $auth['wordpress']['rel_path'] . '/wp-load.php';
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/joomla.inc
--- a/web/joomla.inc Fri Oct 28 11:29:39 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?php
-
-global $auth;
-
-define('_JEXEC', 1);
-define('JPATH_BASE', realpath(MRBS_ROOT . DS . $auth['joomla']['rel_path']));
-
-require_once JPATH_BASE . DS . 'includes' . DS . 'defines.php';
-require_once JPATH_BASE . DS . 'includes' . DS . 'framework.php';
-
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/session/session_joomla.inc
--- a/web/session/session_joomla.inc Fri Oct 28 11:29:39 2016 +0100
+++ b/web/session/session_joomla.inc Fri Oct 28 11:38:44 2016 +0100
@@ -1,7 +1,7 @@
<?php
namespace MRBS;
-require_once MRBS_ROOT . '/joomla.inc';
+require_once MRBS_ROOT . '/auth/cms/joomla.inc';
$mainframe = JFactory::getApplication('site');
$mainframe->initialise();
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/session/session_wordpress.inc
--- a/web/session/session_wordpress.inc Fri Oct 28 11:29:39 2016 +0100
+++ b/web/session/session_wordpress.inc Fri Oct 28 11:38:44 2016 +0100
@@ -1,7 +1,7 @@
<?php
namespace MRBS;
-require_once MRBS_ROOT . '/wordpress.inc';
+require_once MRBS_ROOT . '/auth/cms/wordpress.inc';
// Get non-standard form variables
$Action = get_form_var('Action', 'string');
diff -r 072fc74ae084 -r 33f7f9a44ca6 web/wordpress.inc
--- a/web/wordpress.inc Fri Oct 28 11:29:39 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<?php
-
-define('WP_USE_THEMES', false);
-require_once MRBS_ROOT . '/'. $auth['wordpress']['rel_path'] . '/wp-load.php';
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
