Changeset 3108589

Timestamp:

06/27/2024 11:07:06 AM (4 weeks ago)

Author:

averta

Message:

Committing 3.1.2 to trunk

Location:

depicter/trunk

Files:

• app/hooks.php (modified) (4 diffs)
• app/src/Database/Repository/MetaRepository.php (modified) (1 diff)
• app/src/Document/Manager.php (modified) (1 diff)
• app/src/Document/Models/Document.php (modified) (1 diff)
• app/src/Document/Models/Traits/DocumentAdminNoticeTrait.php (modified) (7 diffs)
• app/src/Front/Preview.php (modified) (3 diffs)
• app/src/Front/Render.php (modified) (4 diffs)
• app/src/Services/AuthenticationService.php (modified) (2 diffs)
• app/src/WordPress/FileUploaderService.php (modified) (3 diffs)
• depicter.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

depicter/trunk/app/hooks.php

@@ -12 +12 @@
 }
 
-// phpcs:ignore
-// add_action( 'some_action', 'some_function' );
 function depicter_add_thumbnail_size() {
     add_image_size( 'depicter-thumbnail', 200, 9999, false );
@@ -162 +160 @@
 
 function depicter_check_activation() {
+
     if ( isset( $_GET['depicter_upgraded'] ) ) {
         if ( \Depicter::client()->validateActivation() ) {
@@ -171 +170 @@
         }
     }
-    if ( isset( $_GET['depicter_flush_tokens'] ) ) {
+
+    if ( isset( $_GET['depicter_flush_tokens'] ) && user_can( wp_get_current_user(), 'manage_options') ) {
         \Depicter::client()->getRefreshToken( true );
         \Depicter::client()->getAccessToken( true );
@@ -205 +205 @@
 add_action( 'admin_notices', 'depicter_renew_subscription_notice');
 function depicter_renew_subscription_notice() {
-    $expiresAt = \Depicter::options()->get('subscription_expires_at' , '');
-    if ( empty( $expiresAt ) || strtotime( $expiresAt ) > time() ) {
+    if ( ! \Depicter::auth()->isSubscriptionExpired() ) {
         return;
     }

depicter/trunk/app/src/Database/Repository/MetaRepository.php

@@ -23 +23 @@
      */
     public function meta(): Meta{
-        return new Meta();
+        return ();
     }
 

depicter/trunk/app/src/Document/Manager.php

@@ -141 +141 @@
         // set document entity properties
         $documentModel->setDocumentId( $documentId );
-        $documentModel->setUnpublishedNotice( $documentId );
+        $documentModel->setNotice( $documentId );
         $documentModel->setEntityProperty( 'status', $this->getStatus( $documentId ) );
 

depicter/trunk/app/src/Document/Models/Document.php

@@ -218 +218 @@
             $style = Html::style([],'
                 .depicter-admin-notices {
-                    position:absolute; 
-                    left: 20px; 
-                    top: 20px; 
-                    display: flex; 
-                    gap:8px; 
+                    position:absolute;
+                    left: 20px;
+                    top: 20px;
+                    display: flex;
+                    gap:8px;
                     flex-direction: column;
                     z-index: 50;

depicter/trunk/app/src/Document/Models/Traits/DocumentAdminNoticeTrait.php

@@ -3 +3 @@
 
 use Averta\Core\Utility\JSON;
+
 
 trait DocumentAdminNoticeTrait {
@@ -11 +12 @@
      * @var int|null
      */
-    protected $showUnpublishedNotice = false;
+    protected $showNotice = false;
 
     /**
@@ -18 +19 @@
      * @return int|null
      */
-    public function showUnpublishedNotice() {
-        return $this->showUnpublishedNotice;
+    public function showNotice() {
+        return $this->showNotice;
     }
 
@@ -25 +26 @@
      * Enables or disables unpublished notice of document
      *
-     * @param int $showUnpublishedNotice
+     * @param int $showNotice
      *
      * @return mixed
      */
-    public function setUnpublishedNotice( $showUnpublishedNotice = false ) {
-        $this->showUnpublishedNotice = $showUnpublishedNotice;
+    public function setNotice = false ) {
+        $this->showNotice;
         return $this;
     }
@@ -40 +41 @@
      */
     public function getUnpublishedChangesNotice() {
-        if( ! $this->showUnpublishedNotice() || ! $this->getDocumentID() ) {
+        if( ! $this->showNotice() || ! $this->getDocumentID() ) {
             return '';
         }
@@ -78 +79 @@
      */
     public function getExpiredSubscriptionNotice() {
-        if( ! $this->getDocumentID() ) {
+        if( ! $this->getDocumentID() ) {
             return '';
         }
@@ -86 +87 @@
         }
 
-        $documentType = \Depicter::documentRepository()->findOne( $this->getDocumentID() )->getProperty('type');
-        if ( in_array( $documentType, ['popup', 'banner-bar'] ) ) {
+        try{
+            // skip admin notice display for popup and notification bars
+            if ( in_array( \Depicter::documentRepository()->findOne( $this->getDocumentID() )->getProperty('type'), ['popup', 'banner-bar', 'notification-bar'] ) ) {
+                return '';
+            }
+        }catch( \Exception $e ){
             return '';
         }

depicter/trunk/app/src/Front/Preview.php

@@ -104 +104 @@
         try{
             $documentModel = \Depicter::document()->getModel( $documentId, $where );
-            $documentModel->setUnpublishedNotice( false );
+            $documentModel->setNotice( false );
             $viewArgs = $this->prepareToRender( $documentModel, $viewArgs );
 
@@ -184 +184 @@
      */
     protected function view( $args ){
-        // JetPack compatibility issue 
+        // JetPack compatibility issue
         if ( class_exists( 'Filter_Embedded_HTML_Objects' ) ) {
             remove_filter( 'pre_kses', array( 'Filter_Embedded_HTML_Objects', 'filter' ), 11 );
@@ -191 +191 @@
         $view = \Depicter::view('canvas.php')->with( 'view_args', $args )->toString();
 
-        // JetPack compatibility issue 
+        // JetPack compatibility issue
         if ( class_exists( 'Filter_Embedded_HTML_Objects' ) ) {
             add_filter( 'pre_kses', array( 'Filter_Embedded_HTML_Objects', 'filter' ), 11 );

depicter/trunk/app/src/Front/Render.php

@@ -36 +36 @@
             'echo'          => true,
             'status'        => 'publish',
-            'showUnpublishedNotice' => $isPrivilegedUser
+            'showNotice' => $isPrivilegedUser
         ]);
 
@@ -91 +91 @@
             }
 
-            if( ! $args['showUnpublishedNotice'] && ! \Depicter::document()->repository()->isPublishedBefore( $documentID ) ) {
+            if( ! $args['showNotice'] && ! \Depicter::document()->repository()->isPublishedBefore( $documentID ) ) {
                 throw new DocumentNotPublished( __( 'Slider is not published yet and saved as "draft"', 'depicter' ), 0, $where );
             }
@@ -97 +97 @@
             if( $documentModel = \Depicter::document()->getModel( $documentID, $where ) ){
 
-                $documentModel->setUnpublishedNotice( $args['showUnpublishedNotice'] );
+                $documentModel->setNotice'] );
 
                 $output .= $documentModel->prepare()->render();
@@ -206 +206 @@
         $cacheFor      = !empty( $args['isPrivilegedUser'] ) ? 'admin_' : '';
         // Include admin notice in document markup or not
-        $isAdminNoticeEnabled = !empty( $args['showUnpublishedNotice'] ) ? 'notice_' : '';
+        $isAdminNoticeEnabled = !empty( $args['showNotice'] ) ? 'notice_' : '';
         // The last modified date of main document
         $documentModifiedTime = strtotime( \Depicter::documentRepository()->getFieldValue( $documentID, 'modified_at') );

depicter/trunk/app/src/Services/AuthenticationService.php

@@ -64 +64 @@
             $subExpiresAtTimestamp = strtotime($subExpiresAt." UTC");
             $afterExpirationInSeconds = time() - $subExpiresAtTimestamp;
-            
+
             if( $afterExpirationInSeconds > 5 * DAY_IN_SECONDS ) {
                 return 'expired';
@@ -72 +72 @@
         }
 
-        return $subExpiresAt;
+        return ;
     }
 

depicter/trunk/app/src/WordPress/FileUploaderService.php

@@ -3 +3 @@
 
 use Averta\WordPress\File\UploadsDirectory;
+
 use GuzzleHttp\Psr7\UploadedFile;
 
@@ -26 +27 @@
             }
 
-            if ( !in_array( $file->getClientMediaType(), $allowedMimeTypes ) ) {
+            $clientFileName = Sanitize::fileName( $file->getClientFilename() );
+            // make sure that file mime type is allowed and the extension is not .php
+            if ( !in_array( $file->getClientMediaType(), $allowedMimeTypes ) || substr( $clientFileName, -4 ) === '.php' ) {
                 $results[ $file->getClientFilename() ] = [
                     'attachment'    => 0,
@@ -35 +38 @@
                 continue;
             }
-            
-            $filename = $wp_upload_dir->getPath() . "/" . $file->getClientFilename();
+
+            $filename = $wp_upload_dir->getPath() . "/" . $;
             $file->moveTo( $filename );
             $attachment = array(

depicter/trunk/depicter.php

@@ -4 +4 @@
  * Plugin URI: https://depicter.com
  * Description: Build stunning sliders, popups, carousels, video sliders, post sliders, and WooCommerce sliders fast and easy.
- * Version: 3.1.1
+ * Version: 3.1.
  * Requires at least: 5.3
  * Requires PHP: 7.4.0
@@ -18 +18 @@
  */
 
-const DEPICTER_VERSION = '3.1.1';
+const DEPICTER_VERSION = '3.1.';
 
 if ( ! defined( 'ABSPATH' ) ) {

depicter/trunk/readme.txt

@@ -3 +3 @@
 Tags: slider, carousel slider, popup, post slider, slideshow
 Requires at least: 5.3.0
-Tested up to: WordPress 6.5.4
+Tested up to: WordPress 6.5.
 Requires PHP: 7.4.0
-Stable tag: 3.1.1
+Stable tag: 3.1.
 License: GPL-2.0-only
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -70 +70 @@
 == Changelog ==
 
+
+
+
+
+
 ###3.1.1
 - *Released: 2024-06-20*