diff --git a/Dropbox.make b/Dropbox.make index 7e5c6c7..66a9e5f 100644 --- a/Dropbox.make +++ b/Dropbox.make @@ -1,14 +1,20 @@ ; $Id$ ; -; Dropbox Uploader makefile +; Dropbox & Dropbox Uploader makefile ; ---------------- -; This makefile downloads the lastest version from Dropbox Uploader and -; places it sites/all/libraries/DropboxUploader. +; This makefile downloads the lastest versions of Dropbox and Dropbox Uploader +; and place them at sites/all/libraries/Dropbox and +; sites/all/libraries/DropboxUploader, respectively. core = 7.x api = 2 +libraries[Dropbox][download][type] = "get" +libraries[Dropbox][download][url] = "https://github.com/BenTheDesigner/Dropbox/archive/master.zip" +libraries[Dropbox][directory_name] = "Dropbox" +libraries[Dropbox][destination] = "libraries" + libraries[DropboxUploader][download][type] = "get" -libraries[DropboxUploader][download][url] = "https://github.com/BenTheDesigner/Dropbox/archive/master.zip" -libraries[DropboxUploader][directory_name] = "dropbox" -libraries[DropboxUploader][destination] = "libraries" \ No newline at end of file +libraries[DropboxUploader][download][url] = "https://github.com/jakajancar/DropboxUploader/archive/master.zip" +libraries[DropboxUploader][directory_name] = "DropboxUploader" +libraries[DropboxUploader][destination] = "libraries" diff --git a/backup_migrate_dropbox.install b/backup_migrate_dropbox.install index 319337b..09c599e 100644 --- a/backup_migrate_dropbox.install +++ b/backup_migrate_dropbox.install @@ -12,22 +12,36 @@ function backup_migrate_dropbox_requirements($phase) { $requirements = array(); $t = get_t(); if ($phase == 'install') { - if (!file_exists('sites/all/libraries/Dropbox-master/Dropbox/API.php')) { - $requirements['dropbox'] = array( - 'title' => $t('BenTheDesigner\'s Dropbox REST API'), + if (!file_exists('sites/all/libraries/Dropbox/Dropbox/API.php')) { + $requirements['php_5_3_sdk_for_the_dropbox_rest_api'] = array( + 'title' => $t('BenTheDesigner\'s PHP 5.3 SDK for the Dropbox REST API'), 'value' => $t('Missing'), 'description' => $t( - 'BenTheDesigner\'s Dropbox REST API library is missing, please download it from !link and place it at !directory', + 'BenTheDesigner\'s PHP 5.3 SDK for the Dropbox REST API is missing, please download it from !link and place it at !directory', array( '!link' => 'https://github.com/BenTheDesigner/Dropbox', - '!directory' => 'sites/all/libraries/Dropbox-master', + '!directory' => 'sites/all/libraries/Dropbox', ) ), 'severity' => REQUIREMENT_ERROR, ); } } - return $requirements; -} + if (!file_exists('sites/all/libraries/DropboxUploader/DropboxUploader.php')) { + $requirements['dropbox_uploader'] = array( + 'title' => $t('Jaka Jančar\'s Dropbox Uploader'), + 'value' => $t('Missing'), + 'description' => $t( + 'Jaka Jančar\'s Dropbox Uploader is missing, please download it from !link and place it at !directory', + array( + '!link' => 'https://github.com/jakajancar/DropboxUploader/', + '!directory' => 'sites/all/libraries/DropboxUploader', + ) + ), + 'severity' => REQUIREMENT_ERROR, + ); + } + return $requirements; +} diff --git a/backup_migrate_dropbox.module b/backup_migrate_dropbox.module index f38af06..4e2791d 100644 --- a/backup_migrate_dropbox.module +++ b/backup_migrate_dropbox.module @@ -10,11 +10,26 @@ */ function backup_migrate_dropbox_backup_migrate_destination_types() { return array( - 'dropbox' => array( - 'type_name' => t('Dropbox'), - 'description' => t('Save the backup files to a !link account.', array('!link' => l(t('Dropbox'), 'http://www.dropbox.com/'))), - 'file' => drupal_get_path('module', 'backup_migrate_dropbox') . '/destinations.dropbox.inc', - 'class' => 'backup_migrate_destination_dropbox', + 'dropbox-rest-api' => array( + 'type_name' => t('Dropbox REST API'), + 'description' => t('Save the backup files to a !dropbox account using BenTheDesigner\'s PHP 5.3 SDK for the Dropbox REST API.', + array( + '!dropbox' => l(t('Dropbox'), 'http://www.dropbox.com/'), + '!link' => 'https://github.com/BenTheDesigner/Dropbox', + )), + 'file' => drupal_get_path('module', 'backup_migrate_dropbox') . '/destinations.dropbox_rest_api.inc', + 'class' => 'backup_migrate_destination_dropbox_rest_api', + 'can_create' => TRUE, + ), + 'dropbox-uploader' => array( + 'type_name' => t('Dropbox Uploader'), + 'description' => t('Save the backup files to a !dropbox account using Jaka Jančar\'s Dropbox Uploader.', + array( + '!dropbox' => l(t('Dropbox'), 'http://www.dropbox.com/'), + '!link' => 'https://github.com/jakajancar/DropboxUploader/', + )), + 'file' => drupal_get_path('module', 'backup_migrate_dropbox') . '/destinations.dropbox_uploader.inc', + 'class' => 'backup_migrate_destination_dropbox_uploader', 'can_create' => TRUE, ), ); diff --git a/ThawtePremiumServerCA.crt b/ThawtePremiumServerCA.crt new file mode 100644 index 0000000..ef676de --- /dev/null +++ b/ThawtePremiumServerCA.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy +dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t +MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB +MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG +A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl +cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv +bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE +VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ +ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR +uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI +hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM +pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== +-----END CERTIFICATE----- diff --git a/destinations.dropbox_rest_api.inc b/destinations.dropbox_rest_api.inc index 4574876..8d40068 100644 --- a/destinations.dropbox_rest_api.inc +++ b/destinations.dropbox_rest_api.inc @@ -2,16 +2,17 @@ /** * @file - * Functions to handle the dropbox backup destination. + * Functions to handle the Dropbox REST API backup destination. */ /** - * A destination for sending database backups to a Dropbox account. + * A destination for sending database backups to a Dropbox account using + * BenTheDesigner's PHP 5.3 SDK for the Dropbox REST API. * * @ingroup backup_migrate_destinations */ -class backup_migrate_destination_dropbox extends backup_migrate_destination_remote { - var $supported_ops = array('scheduled backup', 'manual backup'); +class backup_migrate_destination_dropbox_rest_api extends backup_migrate_destination_remote { + var $supported_ops = array('manual backup'); var $dropbox = NULL; /** @@ -121,7 +122,7 @@ class backup_migrate_destination_dropbox extends backup_migrate_destination_remo * Create the DropBox object from BenTheDesigner's PHP API. */ function dropbox_object() { - require_once 'sites/all/libraries/dropbox/Dropbox/API.php'; + require_once 'sites/all/libraries/Dropbox/Dropbox/API.php'; if (!$this->dropbox) { $key = $this->dest_url['user']; $secret = $this->dest_url['pass']; @@ -134,7 +135,7 @@ class backup_migrate_destination_dropbox extends backup_migrate_destination_remo // TODO: figure out if this is the best way to do this. spl_autoload_register(function($class) { $class = str_replace('\\', '/', $class); - require_once(libraries_get_path('dropbox') . '/' . $class . '.php'); + require_once(libraries_get_path('Dropbox') . '/' . $class . '.php'); }); // Instantiate the Encrypter and storage objects @@ -150,5 +151,3 @@ class backup_migrate_destination_dropbox extends backup_migrate_destination_remo return $this->dropbox; } } - - diff --git a/destinations.dropbox_uploader.inc b/destinations.dropbox_uploader.inc new file mode 100644 index 0000000..7062554 --- /dev/null +++ b/destinations.dropbox_uploader.inc @@ -0,0 +1,68 @@ +dropbox_object(); + $destination = $this->dest_url['path']; + if ('/' != $destination[0]) { + $destination = '/'. $destination; + } + + $dest_filename = realpath(variable_get('file_temporary_path', '')) . '/' . $file->file_info['filename'] . '.' . implode('.', $file->ext); + + rename($file->filepath(), $dest_filename); + try { + $dropbox->upload($dest_filename, $destination); + } + catch (Exception $e) { + watchdog('backup_migrate', + 'There was a problem when we tried to save the file to Dropbox, the error message was: !error', + array('!error' => $e->getMessage()), + WATCHDOG_ERROR); + return FALSE; + } + return $file; + } + + /** + * Get the form for the settings for this filter. + */ + function edit_form() { + $form = parent::edit_form(); + $form['scheme']['#type'] = 'value'; + $form['scheme']['#value'] = 'https'; + $form['host']['#type'] = 'value'; + $form['host']['#value'] = 'www.dropbox.com'; + $form['path']['#description'] = 'A relative folder inside your Dropbox account'; + $form['user']['#title'] = 'Dropbox E-mail'; + $form['pass']['#title'] = 'Dropbox Password'; + + return $form; + } + + function dropbox_object() { + require_once 'sites/all/libraries/DropboxUploader/DropboxUploader.php'; + if (!$this->dropbox) { + $this->dropbox = new DropboxUploader($this->dest_url['user'], $this->dest_url['pass']); + $this->dropbox->setCaCertificateFile('./'. drupal_get_path('module', 'backup_migrate_dropbox') .'/ThawtePremiumServerCA.crt'); + } + return $this->dropbox; + } +}