Changeset 2793340

Timestamp:

10/03/2022 09:23:20 AM (3 years ago)

Author:

andreadegiovine

Message:

1.1.9

Location:

cloud-customer-area

Files:

• tags/1.1.9 (added)
• tags/1.1.9/assets (added)
• tags/1.1.9/assets/admin-ui.css (added)
• tags/1.1.9/assets/folder.svg (added)
• tags/1.1.9/assets/frontend.css (added)
• tags/1.1.9/assets/frontend.js (added)
• tags/1.1.9/assets/loading.svg (added)
• tags/1.1.9/cloud-customer-area.php (added)
• tags/1.1.9/inc (added)
• tags/1.1.9/inc/functions.php (added)
• tags/1.1.9/inc/google-api.php (added)
• tags/1.1.9/index.php (added)
• tags/1.1.9/part (added)
• tags/1.1.9/part/settings_page.php (added)
• tags/1.1.9/part/settings_page_customize.php (added)
• tags/1.1.9/part/settings_page_main.php (added)
• tags/1.1.9/part/settings_page_oauth.php (added)
• tags/1.1.9/readme.txt (added)
• trunk/assets/frontend.css (modified) (1 diff)
• trunk/assets/frontend.js (modified) (1 diff)
• trunk/cloud-customer-area.php (modified) (3 diffs)
• trunk/inc/functions.php (modified) (1 diff)
• trunk/inc/google-api.php (modified) (2 diffs)
• trunk/readme.txt (modified) (4 diffs)

cloud-customer-area/trunk/assets/frontend.css

@@ -123 +123 @@
     border-bottom: 0;
 }
+
+.cloud-customer-area-icon {
+    height: 16px;
+    width: 16px;
+    display: inline-block;
+    margin: 0 5px;
+    vertical-align: text-bottom;
+}

cloud-customer-area/trunk/assets/frontend.js

@@ -17 +17 @@
                 load_el.remove();
                 $.each( data, function( key, value ) {
-                    $(table_el).append( '<tr><td>'+ value.name +'</td><td>'+ value.date +'</td><td>'+ value.ext +'</td><td>'+ value.download_link +'</td></tr>' );
+                    var icon = value.icon.length > 0 ? '<span class="cloud-customer-area-icon" style="background-image: url('+ value.icon +')"></span>' : '';
+                    $(table_el).append( '<tr><td>'+ value.name +'</td><td>'+ value.date +'</td><td>'+ icon + value.ext +'</td><td>'+ value.download_link +'</td></tr>' );
                 });
             },

cloud-customer-area/trunk/cloud-customer-area.php

@@ -8 +8 @@
 Text Domain: cloud-customer-area
 Domain Path: /languages/
-Version: 1.1.8
+Version: 1.1.9
 */
 
@@ -168 +168 @@
 
             if (isset($_GET['action']) && $_GET['action'] == 'download' && isset($_GET['download_name']) && isset($_GET['download_id']) && isset($_GET['token']) && (!in_array('guest', $customer_roles) ? wp_verify_nonce($_GET['token'], CCA_SLUG . '_download') : true)) {
-                CCA_googleApi_downloadFile($_GET['download_name'], $_GET['download_id']);
+                CCA_googleApi_downloadFile($_GET['download_name'], $_GET['download_id'], (!empty($_GET['export']) ? $_GET['export'] : false));
                 exit;
             } else {
@@ -224 +224 @@
                         $time = explode('T', $file->modifiedTime)[1];
                         $time = explode(':', $time)[0] . ':' . explode(':', $time)[1];
-
+                        $download_args = [
+                            'action' => 'download',
+                            'download_name' => urlencode($file->name),
+                            'download_id' => $file->id,
+                            'token' => wp_create_nonce(CCA_SLUG . '_download')
+                        ];
+                        if(strpos($file->mimeType, 'application/vnd.google-apps') !== false){
+                            $download_args['export'] = str_replace('application/vnd.google-apps.', '', $file->mimeType);
+                        }
+                        $download_link = add_query_arg($download_args, site_url());
                         $return_output[] = array(
                             'name' => $file->name,
                             'date' => $date,
-                            'ext' => $file->fileExtension,
-                            'download_link' => '<a href="' . site_url() . '/?action=download&download_name=' . urlencode($file->name) . '&download_id=' . $file->id . '&token=' . wp_create_nonce(CCA_SLUG . '_download') . '" target="_blank">' . __(CCA_getSetting('label_download', 'customize'), 'cloud-customer-area') . '</a>',
+                            'ext' => !empty($file->fileExtension) ? $file->fileExtension : '',
+                            'icon' => !empty($file->iconLink) ? $file->iconLink : '',
+                            'download_link' => '<a href="' . $download_link . '" target="_blank">' . __(CCA_getSetting('label_download', 'customize'), 'cloud-customer-area') . '</a>',
                         );
                     }

cloud-customer-area/trunk/inc/functions.php

@@ -210 +210 @@
 }
 
-function CCA_googleApi_downloadFile($fileName, $fileId)
-{
-    $google_api = CCA_googleApi_init();
-    $access_token = CCA_getSetting('access_token', 'oauth');
-    $get_file = $google_api->getFile($access_token, $fileId);
+function CCA_googleApi_downloadFile($fileName, $fileId, $export = false)
+{
+    $google_api = CCA_googleApi_init();
+    $access_token = CCA_getSetting('access_token', 'oauth');
+    $get_file = $google_api->getFile($access_token, $fileId, $export);
+    $fileExportTypeMap = [
+        'audio' => '.mp3',
+        'document' => '.docx',
+        'drawing' => '.pdf',
+        'file' => '',
+        'presentation' => '.pptx',
+        'spreadsheet' => '.xlsx'
+    ];
+    if($export && !empty($fileExportTypeMap[$export])){
+        $fileName .= $fileExportTypeMap[$export];
+    }
     header('Content-Type: application/octet-stream');
     header("Content-Transfer-Encoding: Binary");

cloud-customer-area/trunk/inc/google-api.php

@@ -124 +124 @@
             $args = array(
                 'key' => $this->client_id,
-                'fields' => 'nextPageToken, files(id, name, thumbnailLink, fileExtension, modifiedTime)',
+                'fields' => 'nextPageToken, files(id, name, thumbnailLink, fileExtension, modifiedTime, mimeType, iconLink, properties)',
             );
             if (!empty($q)) {
@@ -154 +154 @@
         }
 
-        public function getFile($token = '', $fileID = false)
+        public function getFile($token = '', $fileID = false, $export = false)
         {
             if (!isset($token->access_token)) {
                 return false;
             }
+            $fileExportTypeMap = [
+                'audio' => 'audio/mpeg',
+                'document' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                'drawing' => 'application/pdf',
+                'file' => 'application/octet-stream',
+                'presentation' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                'spreadsheet' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            ];
             $headers = array(
                 'Authorization' => 'Bearer "' . $token->access_token . '"',
             );
-            $response = $this->sendAPIRequest('https://www.googleapis.com/drive/v3/files/' . $fileID . '/?alt=media', '', 'GET', $headers);
+            if($export){
+                if(empty($fileExportTypeMap[$export])){
+                    return 'Error';
+                }
+                $response = $this->sendAPIRequest('https://www.googleapis.com/drive/v3/files/' . $fileID . '/export?mimeType=' . $fileExportTypeMap[$export], '', 'GET', $headers);
+            } else {
+                $response = $this->sendAPIRequest('https://www.googleapis.com/drive/v3/files/' . $fileID . '/?alt=media', '', 'GET', $headers);
+            }
             return $response;
         }

cloud-customer-area/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://totalpress.org/donate?utm_source=wordpress_org&utm_medium=plugin_page&utm_campaign=cloud_customer_area
 Requires at least: 4.0
-Tested up to: 5.8
-Stable tag: 1.1.8
+Tested up to: 6.0
+Stable tag: 1.1.9
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -40 +40 @@
 This plugin is written using only **functions included in the WordPress core**, so it does **not reduce the performance of your website** and does **not cause compatibility problems**.
 You can use the "Cloud Customer Area" plugin with **any theme builder**, with any theme and with **any plugin**. It's perfect!
+
+**Files created with Google apps can be downloaded via the plugin only if the size does not exceed 10mb.**
 
 == Cloud Customer Area features ==
@@ -99 +101 @@
 == Changelog ==
 
+= 1.1.9 =
+* WP 6.0 compatibility;
+* Export Google apps file;
+
 = 1.1.8 =
 * WP 5.8 compatibility.
@@ -127 +133 @@
 
 == Upgrade Notice ==
+
+= 1.1.9 =
+WP 6.0 compatibility;
+Export Google apps file;
 
 = 1.1.8 =