Redundant code in classes/plugins/PaymethodPlugin.inc.php

[derekp]

The methods

• PaymethodPlugin::getInstallSchemaFile()
• PaymethodPlugin::updateSchema()
• PaymethodPlugin::getInstallDataFile()
• PaymethodPlugin::installData()

are identical to those in the Plugin superclass, and should therefore be inherited. This goes for OCS 2.0.0-1 as well as CVS as of 2008-02-13.

Code: Select all

--- classes/plugins/PaymethodPlugin.inc.php.inherit     2008-02-16 04:46:19.930823000 -0800
+++ classes/plugins/PaymethodPlugin.inc.php     2008-02-18 14:17:29.074572000 -0800
@@ -63,49 +63,4 @@
        }

-       /**
-        * Get the filename of the ADODB schema for this plugin.
-        * Subclasses using SQL tables should override this.
-        */
-       function getInstallSchemaFile() {
-               return null;
-       }
-
-       function updateSchema(&$plugin, $args) {
-               $installer =& $args[0];
-               $result =& $args[1];
-
-               $schemaXMLParser = &new adoSchema($installer->dbconn, $installer->dbconn->charSet);
-               $sql = $schemaXMLParser->parseSchema($this->getInstallSchemaFile());
-               if ($sql) {
-                       $result = $installer->executeSQL($sql);
-               } else {
-                       $installer->setError(INSTALLER_ERROR_DB, str_replace('{$file}', $this->getInstallSchemaFile(), Locale::translate('installer.installParseDBFileError')));
-                       $result = false;
-               }
-               return false;
-       }
-
-       /**
-        * Get the filename of the install data for this plugin.
-        * Subclasses using SQL tables should override this.
-        */
-       function getInstallDataFile() {
-               return null;
-       }
-
-       function installData(&$plugin, $args) {
-               $installer =& $args[0];
-               $result =& $args[1];
-
-               $sql = $installer->dataXMLParser->parseData($this->getInstallDataFile());
-               if ($sql) {
-                       $result = $installer->executeSQL($sql);
-               } else {
-                       $installer->setError(INSTALLER_ERROR_DB, str_replace('{$file}', $this->getInstallDataFile(), Locale::translate('installer.installParseDBFileError')));
-                       $result = false;
-               }
-               return false;
-       }
-
        function displayPaymentForm($queuedPaymentId, $key, &$queuedPayment) {
                die('ABSTRACT METHOD');


[asmecher]

Hi derekp,

Thanks for contributing!

Regards,
Alec Smecher
Public Knowledge Project Team