From 611d4c23340364f6db0b0e28430f581c2a796a8c Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Mon, 29 Jul 2019 09:13:47 +0100 Subject: [PATCH] dev/core#1153 Remove unused standalone-mode code --- CRM/Core/Invoke.php | 21 ------ CRM/Core/Session.php | 3 - CRM/Core/xml/Menu/Misc.xml | 7 -- xml/schema/Standalone/OpenID/Associations.xml | 64 ------------------- xml/schema/Standalone/OpenID/Nonce.xml | 43 ------------- xml/schema/Standalone/OpenID/files.xml | 7 -- 6 files changed, 145 deletions(-) delete mode 100644 xml/schema/Standalone/OpenID/Associations.xml delete mode 100644 xml/schema/Standalone/OpenID/Nonce.xml delete mode 100644 xml/schema/Standalone/OpenID/files.xml diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php index 9a9e04a932..9f9a8b776b 100644 --- a/CRM/Core/Invoke.php +++ b/CRM/Core/Invoke.php @@ -80,7 +80,6 @@ class CRM_Core_Invoke { // may exit self::hackMenuRebuild($args); self::init($args); - self::hackStandalone($args); $item = self::getItem($args); return self::runItem($item); } @@ -140,26 +139,6 @@ class CRM_Core_Invoke { $i18n = CRM_Core_I18n::singleton(); } - /** - * Hackish support for /standalone/* - * - * @param array $args - * List of path parts. - * @void - */ - public static function hackStandalone($args) { - $config = CRM_Core_Config::singleton(); - if ($config->userFramework == 'Standalone') { - $session = CRM_Core_Session::singleton(); - if ($session->get('new_install') !== TRUE) { - CRM_Core_Standalone::sidebarLeft(); - } - elseif ($args[1] == 'standalone' && $args[2] == 'register') { - CRM_Core_Menu::store(); - } - } - } - /** * Determine which menu $item corresponds to $args * diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php index 982c63fa9c..762795a118 100644 --- a/CRM/Core/Session.php +++ b/CRM/Core/Session.php @@ -70,9 +70,6 @@ class CRM_Core_Session { * * The CMS takes care of initiating the php session handler session_start(). * - * When using CiviCRM standalone (w/o a CMS), we start the session - * in index.php and then pass it off to here. - * * All crm code should always use the session using * CRM_Core_Session. we prefix stuff to avoid collisions with the CMS and also * collisions with other crm modules! diff --git a/CRM/Core/xml/Menu/Misc.xml b/CRM/Core/xml/Menu/Misc.xml index b043a12170..86819352d3 100644 --- a/CRM/Core/xml/Menu/Misc.xml +++ b/CRM/Core/xml/Menu/Misc.xml @@ -46,13 +46,6 @@ CRM_ACL_Page_ACLBasic administer CiviCRM,access CiviCRM - - civicrm/standalone/register - Registration Page - CRM_Standalone_Form_Register - 1 - true - civicrm/file Browse Uploaded files diff --git a/xml/schema/Standalone/OpenID/Associations.xml b/xml/schema/Standalone/OpenID/Associations.xml deleted file mode 100644 index b4f693fbe9..0000000000 --- a/xml/schema/Standalone/OpenID/Associations.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - CRM/Standalone/OpenID - Associations - civicrm_openid_associations - The OpenID associations store for standalone login. - 2.0 - - id - int unsigned - true - 2.0 - - - id - true - - - server_url - blob - 2.0 - - - handle - varchar - 255 - - Text - - 2.0 - - - secret - blob - 2.0 - - - issued - int - 2.0 - - - lifetime - int - 2.0 - - - assoc_type - varchar - 64 - - Text - - 2.0 - - - server_url_handle_index - server_url - handle - true - 2.0 - -
diff --git a/xml/schema/Standalone/OpenID/Nonce.xml b/xml/schema/Standalone/OpenID/Nonce.xml deleted file mode 100644 index 60b502a1e2..0000000000 --- a/xml/schema/Standalone/OpenID/Nonce.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - CRM/Standalone/OpenID - Nonce - civicrm_openid_nonces - The OpenID nonce store for standalone login. - 2.0 - - id - int unsigned - true - 2.0 - - - id - true - - - server_url - blob - 2.0 - - - timestamp - int - 2.0 - - - salt - char - 40 - 2.0 - - - nonce_index - server_url - timestamp - salt - true - 2.0 - -
diff --git a/xml/schema/Standalone/OpenID/files.xml b/xml/schema/Standalone/OpenID/files.xml deleted file mode 100644 index a1ae573cdf..0000000000 --- a/xml/schema/Standalone/OpenID/files.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - -- 2.25.1