projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ceb9c2)
dev/core#1153 Remove unused standalone-mode code
authorJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 29 Jul 2019 08:13:47 +0000 (09:13 +0100)
committerJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 29 Jul 2019 08:31:51 +0000 (09:31 +0100)
CRM/Core/Invoke.php patch | blob | blame | history
CRM/Core/Session.php patch | blob | blame | history
CRM/Core/xml/Menu/Misc.xml patch | blob | blame | history
xml/schema/Standalone/OpenID/Associations.xml [deleted file] patch | blob | blame | history
xml/schema/Standalone/OpenID/Nonce.xml [deleted file] patch | blob | blame | history
xml/schema/Standalone/OpenID/files.xml [deleted file] patch | blob | blame | history

diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
index 9a9e04a9327b3000f32cb11bce2ce897acd574ca..9f9a8b776b56d23b77fa2bc666be70836dccf9a8 100644 (file)
--- 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 982c63fa9c3d5071cb6867676838323ec25cc1bb..762795a1185f0103ae4d871984849021be9a8763 100644 (file)
--- 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 b043a121704ead482f7cd375098d65c79a8ec64a..86819352d3d52be89b1a5128303cb79a9d8c4df6 100644 (file)
--- a/CRM/Core/xml/Menu/Misc.xml
+++ b/CRM/Core/xml/Menu/Misc.xml
@@ -46,13 +46,6 @@
      <page_callback>CRM_ACL_Page_ACLBasic</page_callback>
      <access_arguments>administer CiviCRM,access CiviCRM</access_arguments>
   </item>
-  <item>
-     <path>civicrm/standalone/register</path>
-     <title>Registration Page</title>
-     <page_callback>CRM_Standalone_Form_Register</page_callback>
-     <access_callback>1</access_callback>
-     <is_public>true</is_public>
-  </item>
   <item>
      <path>civicrm/file</path>
      <title>Browse Uploaded files</title>
diff --git a/xml/schema/Standalone/OpenID/Associations.xml b/xml/schema/Standalone/OpenID/Associations.xml
deleted file mode 100644 (file)
index b4f693f..0000000
--- a/xml/schema/Standalone/OpenID/Associations.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-
-<table>
-  <base>CRM/Standalone/OpenID</base>
-  <class>Associations</class>
-  <name>civicrm_openid_associations</name>
-  <comment>The OpenID associations store for standalone login.</comment>
-  <add>2.0</add>
-  <field>
-    <name>id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <add>2.0</add>
-  </field>
-  <primaryKey>
-    <name>id</name>
-    <autoincrement>true</autoincrement>
-  </primaryKey>
-  <field>
-    <name>server_url</name>
-    <type>blob</type>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>handle</name>
-    <type>varchar</type>
-    <length>255</length>
-    <html>
-      <type>Text</type>
-    </html>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>secret</name>
-    <type>blob</type>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>issued</name>
-    <type>int</type>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>lifetime</name>
-    <type>int</type>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>assoc_type</name>
-    <type>varchar</type>
-    <length>64</length>
-    <html>
-      <type>Text</type>
-    </html>
-    <add>2.0</add>
-  </field>
-  <index>
-    <name>server_url_handle_index</name>
-    <fieldName length="166">server_url</fieldName>
-    <fieldName length="166">handle</fieldName>
-    <unique>true</unique>
-    <add>2.0</add>
-  </index>
-</table>
diff --git a/xml/schema/Standalone/OpenID/Nonce.xml b/xml/schema/Standalone/OpenID/Nonce.xml
deleted file mode 100644 (file)
index 60b502a..0000000
--- a/xml/schema/Standalone/OpenID/Nonce.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-
-<table>
-  <base>CRM/Standalone/OpenID</base>
-  <class>Nonce</class>
-  <name>civicrm_openid_nonces</name>
-  <comment>The OpenID nonce store for standalone login.</comment>
-  <add>2.0</add>
-  <field>
-    <name>id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <add>2.0</add>
-  </field>
-  <primaryKey>
-    <name>id</name>
-    <autoincrement>true</autoincrement>
-  </primaryKey>
-  <field>
-    <name>server_url</name>
-    <type>blob</type>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>timestamp</name>
-    <type>int</type>
-    <add>2.0</add>
-  </field>
-  <field>
-    <name>salt</name>
-    <type>char</type>
-    <length>40</length>
-    <add>2.0</add>
-  </field>
-  <index>
-    <name>nonce_index</name>
-    <fieldName length="255">server_url</fieldName>
-    <fieldName>timestamp</fieldName>
-    <fieldName>salt</fieldName>
-    <unique>true</unique>
-    <add>2.0</add>
-  </index>
-</table>
diff --git a/xml/schema/Standalone/OpenID/files.xml b/xml/schema/Standalone/OpenID/files.xml
deleted file mode 100644 (file)
index a1ae573..0000000
--- a/xml/schema/Standalone/OpenID/files.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-
-<tables xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="Nonce.xml"          parse="xml" />
-<xi:include href="Associations.xml"   parse="xml" />
-</tables>