Changeset 2645866

Timestamp:

12/17/2021 03:44:36 PM (4 years ago)

Author:

tildapublishing

Message:

0.3.03 - fix warning meta

Location:

tilda-publishing

Files:

• tags/0.3.03 (added)
• tags/0.3.03/README.md (added)
• tags/0.3.03/class.tilda-admin.php (added)
• tags/0.3.03/class.tilda.php (added)
• tags/0.3.03/css (added)
• tags/0.3.03/css/jquery-ui-tabs.css (added)
• tags/0.3.03/css/styles.css (added)
• tags/0.3.03/images (added)
• tags/0.3.03/images/ajax-loader.gif (added)
• tags/0.3.03/images/icon_tilda.png (added)
• tags/0.3.03/index.php (added)
• tags/0.3.03/js (added)
• tags/0.3.03/js/configuration.js (added)
• tags/0.3.03/js/plugin.js (added)
• tags/0.3.03/languages (added)
• tags/0.3.03/languages/tilda-ru_RU.mo (added)
• tags/0.3.03/languages/tilda-ru_RU.po (added)
• tags/0.3.03/readme.txt (added)
• tags/0.3.03/screenshot-1.jpg (added)
• tags/0.3.03/screenshot-2.jpg (added)
• tags/0.3.03/tilda-wordpress-plugin.php (added)
• tags/0.3.03/views (added)
• tags/0.3.03/views/configuration.php (added)
• tags/0.3.03/views/pages_meta_box.php (added)
• tags/0.3.03/views/switcher_status.php (added)
• trunk/class.tilda-admin.php (modified) (28 diffs)
• trunk/class.tilda.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/tilda-wordpress-plugin.php (modified) (2 diffs)

tilda-publishing/trunk/class.tilda-admin.php

@@ -37 +37 @@
             self::$ts_start_plugin = time();
         }
-
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
 
         self::$initiated = true;
@@ -123 +121 @@
             }
         }
-        //map_page_post ready to save
 
         //If everything goes fine until this, then save new data structure
@@ -157 +154 @@
     public static function admin_init()
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         register_setting(
             static::OPTION_KEYS,
@@ -194 +189 @@
     public static function admin_menu()
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
         self::load_menu();
     }
@@ -200 +194 @@
     public static function load_menu()
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
         add_submenu_page(
             'options-general.php',
@@ -213 +206 @@
     public static function add_meta_box()
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         $post = get_post();
         $data = get_post_meta($post->ID, '_tilda', true);
@@ -220 +211 @@
         $options = get_option(Tilda_Admin::OPTION_OPTIONS);
         $screens = (isset($options['enabledposttypes'])) ? $options['enabledposttypes'] : array('post','page');
-
-        //$screens = array('post', 'page');
-
 
         foreach ($screens as $screen) {
@@ -235 +223 @@
                     'high'
                 );
-            };
+            }
             if (isset($data["status"]) && $data["status"] == 'on') {
                 add_meta_box(
@@ -245 +233 @@
                     'high'
                 );
-            };
+            }
         }
     }
@@ -251 +239 @@
     public static function pages_list_callback($post)
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         $data = get_post_meta($post->ID, '_tilda', true);
-        $page_id = isset($data["page_id"]) ? $data["page_id"] : false;
-        $project_id = isset($data["project_id"]) ? $data["project_id"] : false;
+        //$page_id = isset($data["page_id"]) ? $data["page_id"] : false;
+        //$project_id = isset($data["project_id"]) ? $data["project_id"] : false;
 
         if (isset($data['update_data']) && $data['update_data'] == 'update_data') {
@@ -277 +263 @@
     public static function save_tilda_data($postID)
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         if (!isset($_POST['tilda'])) {
             return;
@@ -307 +291 @@
     public static function admin_enqueue_scripts($hook)
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         wp_register_style('tilda_css', TILDA_PLUGIN_URL . 'css/styles.css', array() , '3');
         wp_enqueue_style('tilda_css');
@@ -358 +340 @@
     public static function initialize()
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
         $keys = Tilda::get_local_keys();
 
@@ -392 +373 @@
     private static function scandir($dir)
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         $list = scandir($dir);
         return array_values($list);
@@ -400 +379 @@
     private static function clear_dir($dir)
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         $list = self::scandir($dir);
 
@@ -677 +654 @@
             }
         }
-
-        //Those settings moved to project level
-        /*if (empty($input['acceptcssinlist']) || $input['acceptcssinlist'] != 'no') {
-            $input['acceptcssinlist'] = 'yes';
-        } else {
-            $input['acceptcssinlist'] = 'no';
-        }
-
-        if (empty($input['type_stored']) || $input['type_stored'] != 'html') {
-            $input['type_stored'] = 'meta';
-        } else {
-            $input['type_stored'] = 'html';
-        }*/
 
         if (isset($input['secret_key'])) {
@@ -812 +776 @@
     }
 
-    private static function validate_required_libs(){
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
+    private static function validate_required_libs()
+    {
         $libs = self::$libs;
-        foreach ($libs as $lib_name){
-            if(!extension_loaded($lib_name)){
-                Tilda::$errors->add( 'no_library',__('Not found library ','tilda').$lib_name);
-            }
-        }
-
-
+        foreach ($libs as $lib_name) {
+            if (!extension_loaded($lib_name)) {
+                Tilda::$errors->add('no_library', __('Not found library ', 'tilda') . $lib_name);
+            }
+        }
     }
 
     public static function display_configuration_page()
     {
-//        self::validate_required_libs();
-
         self::view('configuration');
     }
@@ -834 +793 @@
     public static function switcher_callback($post)
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         $data = get_post_meta($post->ID, '_tilda', true);
         if (! is_array($data)) {
@@ -849 +806 @@
     public static function view($name, array $args = array())
     {
-        // Tilda_Admin::log(__CLASS__."::".__FUNCTION__, __FILE__, __LINE__);
-
         $args = apply_filters('tilda_view_arguments', $args, $name);
 
@@ -897 +852 @@
         if (!is_dir($upload_dir)) {
             wp_mkdir_p($upload_dir);
-            // mkdir($upload_dir, 0755);
-        }
-
-        // self::clear_dir($upload_dir);
+        }
 
         $css_path = $upload_dir . 'css/';
@@ -908 +860 @@
         if (!is_dir($css_path)) {
             wp_mkdir_p($css_path);
-            //mkdir($css_path, 0755);
         }
         if (!is_dir($js_path)) {
-            //mkdir($js_path, 0755);
             wp_mkdir_p($js_path);
         }
         if (!is_dir($pages_path)) {
-            //mkdir($pages_path, 0755);
             wp_mkdir_p($pages_path);
         }
@@ -1075 +1024 @@
         if (is_wp_error($project)) {
             return $project;
-            //$arResult['error'] = __("Error. Can't find project with this 'projectid' parameter");
-            //echo json_encode($arResult);
-            //wp_die();
         }
         $tildaoptions = get_option(Tilda_Admin::OPTION_OPTIONS);
@@ -1085 +1031 @@
         if (is_wp_error($tildapage)) {
             return $tildapage;
-            //$arResult['error'] = __("Error. Can't find page with this 'pageid' parameter");
-            //echo json_encode($arResult);
-            //wp_die();
         }
         // ||s|| is custom escaping symbol used to bypass '<\/script>' text from wordpress engine processing
@@ -1108 +1051 @@
                 $tildapage->html = str_replace("||imgsvalue-{$key}||", $match, $tildapage->html);
             }
+        }
+
+        //remove all css <link> occurrences that was already added to the <header> tag
+        foreach ($tildapage->css as $css) {
+            $tildapage->html = str_replace('<link rel="stylesheet" href="' . $css->to . '">', '', $tildapage->html);
         }
 
@@ -1226 +1174 @@
 
         $meta['current_page'] = $tildapage;
-        //unset($meta['current_page']->html);
         update_post_meta($post_id, '_tilda', $meta);
 
@@ -1314 +1261 @@
         if (!session_id()) {
             session_start();
-            /*if (session_status() != PHP_SESSION_ACTIVE) {
-                Tilda::$errors->add( 'no_start_session', 'Cannoyt start session.');
-                echo Tilda::json_errors();
-                wp_die();
-            }*/
         }
 
@@ -1335 +1277 @@
         $arResult['post_id'] = $post_id;
 
-        //$arResult['dump'] = $arDownload;
-
         echo json_encode($arResult);
         wp_die();
@@ -1355 +1295 @@
         if (!session_id()) {
             session_start();
-            /*if (session_status() != PHP_SESSION_ACTIVE) {
-                Tilda::$errors->add( 'no_start_session', 'Cannoyt start session.');
-                echo Tilda::json_errors();
-                wp_die();
-            }*/
         }
 

tilda-publishing/trunk/class.tilda.php

@@ -259 +259 @@
         if ($post) {
             $data = get_post_meta($post->ID, '_tilda', true);
+            if (empty($data['project_id'])) {
+                $data['project_id'] = (!empty($data['current_page']->projectid)) ? $data['current_page']->projectid : null;
+            }
 
             $key_id = Tilda::get_key_for_project_id($data['project_id']);
@@ -324 +327 @@
         }
         $data = get_post_meta($post->ID, '_tilda', true);
+        if (empty($data['project_id'])) {
+            $data['project_id'] = (!empty($data['current_page']->projectid)) ? $data['current_page']->projectid : null;
+        }
 
         $key_id = Tilda::get_key_for_project_id($data['project_id']);

tilda-publishing/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.9.6
-Stable tag: 0.3.02
+Stable tag: 0.3.03
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -62 +62 @@
 
 == Changelog ==
+
+= 0.3.03 =
+* Update 0.3.03 - minor fix warning on post meta without project_id
 
 = 0.3.02 =

tilda-publishing/trunk/tilda-wordpress-plugin.php

@@ -3 +3 @@
 Plugin Name: Tilda Publishing
 Description: Tilda позволяет делать яркую подачу материала, качественную верстку и эффектную типографику, близкую к журнальной. Каким бы ни был ваш контент — Tilda знает, как его показать. С чего начать: 1) Нажмите ссылку «Активировать» слева от этого описания; 2) <a href="http://www.tilda.cc/" target="_blank">Зарегистрируйтесь</a>, чтобы получить API-ключ; 3) Перейдите на страницу настройки Tilda Publishing и введите свой API-ключ. Читайте подробную инструкцию по подключению.
-Version: 0.3.02
+Version: 0.3.03
 Author: Tilda Publishing
 License: GPLv2 or later
 Text Domain: api tilda
+
+Update 0.3.03 - fix warning on post meta without project_id
 
 Update 0.3.02 - fix ZeroBlock's gallery import
@@ -88 +90 @@
 }
 
-define( 'TILDA_VERSION', '0.3.02' );
+define( 'TILDA_VERSION', '0.3.03' );
 define( 'TILDA_MINIMUM_WP_VERSION', '3.1' );
 define( 'TILDA_PLUGIN_URL', plugin_dir_url( __FILE__ ) );