Added Cloudflare support 🌟

Author: dmhendricks

README.md

@@ -25,6 +25,13 @@ This is currently under development and contains bugs. Test in a development env
 
 This is a WordPress plugin that allows you to serve your WordPress Media Library files via the [Backblaze B2](https://www.backblaze.com/b2/cloud-storage.html#af9kre) cloud storage service.
 
+### Features
+
+- Limit offloading by MIME types
+- Option to remove files from origin server
+- [Shortcode](https://github.com/cloudverve/wordpress-cloud-media-offloader-plugin/wiki/Shortcodes) to create hyperlinks
+- :new: CloudFlare support ([more info](https://www.backblaze.com/blog/backblaze-and-cloudflare-partner-to-provide-free-data-transfer/))
+
 ### Contributing
 
 One of the best ways that you can contribute is to help me make it better, either with code or with constructive feedback. Ways to help:

app/Core.php

@@ -71,7 +71,12 @@ public function add_attachment_filter( $attachment_id ) {
     }
 
     // Get upload filename
-    $url = self::$client->getDownloadUrl( [ 'BucketName' => $bucket_name, 'FileName' => $file['destfile'] ] );
+    $custom_url = rtrim( trim( $this->get_carbon_plugin_option( 'custom_url' ) ), '/' );
+    if( $this->get_carbon_plugin_option( 'enable_custom_url' ) && trim( $custom_url ) ) {
+      $url = sprintf( '%s/file/%s/%s', $custom_url, $bucket_name, $file['destfile'] );
+    } else {
+      $url = self::$client->getDownloadUrl( [ 'BucketName' => $bucket_name, 'FileName' => $file['destfile'] ] );
+    }
 
     // Set upload name
     update_post_meta( $attachment_id, self::prefix( 'external_url' ), $url );

app/Settings/Settings_Page.php

@@ -2,7 +2,7 @@
 namespace CloudVerve\MediaOffloader\Settings;
 use CloudVerve\MediaOffloader\Plugin;
 use CloudVerve\MediaOffloader\Helpers;
-use CloudVerve\MediaOffloader\Services\B2;
+use CloudVerve\MediaOffloader\Provider\B2;
 use Carbon_Fields\Datastore\Datastore\Serialized_Theme_Options_Datastore;
 use Carbon_Fields\Container;
 use Carbon_Fields\Field;
@@ -71,7 +71,6 @@ public function create_tabbed_options_page() {
       Field::make( 'text', $this->prefix( 'account_id' ), __( 'Account ID', self::$textdomain ) )
         ->set_classes( 'cmo-field-length-small' ),
       Field::make( 'text', $this->prefix( 'application_key' ), __( 'Master Application Key', self::$textdomain ) )
-        ->help_text( __( 'These values can be found by clicking the <em>Show Account ID and Application Key</em> link at the top of the bucket list page in the B2 control panel.', self::$textdomain ) )
         ->set_classes( 'cmo-field-length-small' )
         ->set_attribute( 'type', 'password' ),
       Field::make( 'separator', $this->prefix( 'separator_general_bucket_path' ), __( 'Bucket & Path', self::$textdomain ) )
@@ -95,6 +94,17 @@ public function create_tabbed_options_page() {
         ->set_default_value( 'wp-content/uploads/' )
     ]);
 
+    $general_fields = array_merge( $general_fields, [
+      Field::make( 'checkbox', $this->prefix( 'enable_custom_url' ), __( 'Enable Custom URL', self::$textdomain ) )
+        ->help_text( sprintf( __( 'Allows you to provide a custom URL/alias to replace the standard endpoint link. Useful when using a CDN in front of B2, such as <a href="%s" target="_blank">Cloudflare</a> (<a href="%s" target="_blank">setup instructions</a>).', self::$textdomain ), 'https://www.backblaze.com/blog/backblaze-and-cloudflare-partner-to-provide-free-data-transfer/#af9kre', 'https://help.backblaze.com/hc/en-us/articles/217666928-Using-Backblaze-B2-with-the-Cloudflare-CDN#af9kre' ) ),
+      Field::make( 'text', $this->prefix( 'custom_url' ), __( 'Custom URL/Alias', self::$textdomain ) )
+        ->set_attribute( 'placeholder', __( 'Example:', self::$textdomain ) . ' ' . $this->get_root_domain( 'cdn' ) )
+        ->set_conditional_logic([[
+          'field' => $this->prefix( 'enable_custom_url' ),
+          'value' => true
+        ]])
+    ]);
+
     $container = Container::make( 'theme_options', self::$config->get( 'short_name' ) )
       ->set_page_parent('options-general.php')
       ->add_tab( __( 'General', self::$textdomain ), $general_fields
@@ -223,4 +233,22 @@ public function inject_custom_css() {
 
   }
 
+  /**
+   * Gets root domain of current site
+   *
+   * @param string $prepend Sub-domain to prepend
+   * @return string
+   * @since 0.8.1
+   */
+  private function get_root_domain( $prepend = '', $include_scheme = true ) {
+
+    $site_url = site_url();
+    $domain = ltrim( parse_url( $site_url, PHP_URL_HOST ), 'www.' );
+    $scheme = parse_url( $site_url, PHP_URL_SCHEME );
+    if( $prepend ) $domain = $prepend . '.' . $domain;
+    if( $include_scheme ) $domain = $scheme . '://' . $domain . '/';
+    return $domain;
+
+  }
+
 }

languages/cloud-media-offloader.pot

@@ -13,15 +13,15 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../app/Core.php:190
+#: ../app/Core.php:195
 msgid "Documents/Archives"
 msgstr ""
 
-#: ../app/Core.php:190
+#: ../app/Core.php:195
 msgid "Manage Documents/Archives"
 msgstr ""
 
-#: ../app/Core.php:190
+#: ../app/Core.php:195
 msgid "Document/Archivee"
 msgid_plural "Documents/Archives <span class=\"count\">(%s)</span>"
 msgstr[0] ""
@@ -123,7 +123,7 @@ msgid "Account ID"
 msgstr ""
 
 #: ../app/Settings/Settings_Page.php:73
-msgid "Application Key"
+msgid "Master Application Key"
 msgstr ""
 
 #: ../app/Settings/Settings_Page.php:76
@@ -150,59 +150,71 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:101, ../app/Settings/Settings_Page.php:114
+#: ../app/Settings/Settings_Page.php:99
+msgid "Allows you to provide a custom URL/alias to replace the standard endpoint link. Useful when using a CDN in front of B2, such as <a href=\"%s\" target=\"_blank\">CloudFlare</a>."
+msgstr ""
+
+#: ../app/Settings/Settings_Page.php:98
+msgid "Enable Custom URL"
+msgstr ""
+
+#: ../app/Settings/Settings_Page.php:101, ../app/Settings/Settings_Page.php:119, ../app/Settings/Settings_Page.php:121
+msgid "Example:"
+msgstr ""
+
+#: ../app/Settings/Settings_Page.php:100
+msgid "Custom URL/Alias"
+msgstr ""
+
+#: ../app/Settings/Settings_Page.php:112, ../app/Settings/Settings_Page.php:125
 msgid "MIME Types"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:103
+#: ../app/Settings/Settings_Page.php:114
 msgid "If checked, uploads to Backblaze B2 are limited to specific MIME types."
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:102
+#: ../app/Settings/Settings_Page.php:113
 msgid "Limit to Specific MIME Types"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:119
+#: ../app/Settings/Settings_Page.php:130
 msgid "Add New"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:114, ../app/Settings/Settings_Page.php:109
+#: ../app/Settings/Settings_Page.php:125, ../app/Settings/Settings_Page.php:120
 msgid "MIME Type"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:112
+#: ../app/Settings/Settings_Page.php:123
 msgid "Add extra MIME types that are not listed below."
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:112
+#: ../app/Settings/Settings_Page.php:123
 msgid "Examples"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:108, ../app/Settings/Settings_Page.php:110
-msgid "Example:"
-msgstr ""
-
-#: ../app/Settings/Settings_Page.php:107
+#: ../app/Settings/Settings_Page.php:118
 msgid "Extension/Label"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:104
+#: ../app/Settings/Settings_Page.php:115
 msgid "Custom MIME Types"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:121
+#: ../app/Settings/Settings_Page.php:132
 msgid "Registers custom MIME types (if specified)."
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:120
+#: ../app/Settings/Settings_Page.php:131
 msgid "Register Custom MIME Types"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:128
+#: ../app/Settings/Settings_Page.php:139
 msgid "Built-in MIME Types"
 msgstr ""
 
-#: ../app/Settings/Settings_Page.php:99
+#: ../app/Settings/Settings_Page.php:110
 msgid "General"
 msgstr ""