Changeset 2617906

Timestamp:

10/21/2021 04:29:20 PM (4 years ago)

Author:

OTWthemes

Message:

Version: 1.7

Location:

smart-post-lists-light

Files:

• tags/1.6 (added)
• tags/1.6/include (added)
• tags/1.6/include/otw_components (added)
• tags/1.6/include/otw_components/otw_factory (added)
• tags/1.6/include/otw_components/otw_factory/css (added)
• tags/1.6/include/otw_components/otw_factory/css/font-awesome.css (added)
• tags/1.6/include/otw_components/otw_factory/css/otw_factory.css (added)
• tags/1.6/include/otw_components/otw_factory/fonts (added)
• tags/1.6/include/otw_components/otw_factory/fonts/FontAwesome.otf (added)
• tags/1.6/include/otw_components/otw_factory/fonts/fontawesome-webfont.eot (added)
• tags/1.6/include/otw_components/otw_factory/fonts/fontawesome-webfont.svg (added)
• tags/1.6/include/otw_components/otw_factory/fonts/fontawesome-webfont.ttf (added)
• tags/1.6/include/otw_components/otw_factory/fonts/fontawesome-webfont.woff (added)
• tags/1.6/include/otw_components/otw_factory/fonts/fontawesome-webfont.woff2 (added)
• tags/1.6/include/otw_components/otw_factory/otw_factory.class.php (added)
• tags/1.6/include/otw_components/otw_factory/otw_factory.info.php (added)
• tags/1.6/include/otw_components/otw_factory/views (added)
• tags/1.6/include/otw_components/otw_factory/views/action_message.php (added)
• tags/1.6/include/otw_components/otw_factory/views/license_manager.php (added)
• tags/1.6/include/otw_components/otw_functions (added)
• tags/1.6/include/otw_components/otw_functions/otw_component.class.php (added)
• tags/1.6/include/otw_components/otw_functions/otw_functions.php (added)
• tags/1.6/include/otw_labels (added)
• tags/1.6/include/otw_labels/otw_spll_factory_object.labels.php (added)
• tags/1.6/include/otw_spl_plugin_options.php (added)
• tags/1.6/include/otw_spll_process_actions.php (added)
• tags/1.6/readme.txt (added)
• tags/1.6/screenshot-1.png (added)
• tags/1.6/screenshot-2.png (added)
• tags/1.6/screenshot-3.png (added)
• tags/1.6/screenshot-4.png (added)
• tags/1.6/screenshot-5.png (added)
• tags/1.6/screenshot-6.png (added)
• tags/1.6/screenshot-7.png (added)
• tags/1.6/screenshot-8.png (added)
• tags/1.6/splw.css (added)
• tags/1.6/splw.js (added)
• tags/1.6/splw.php (added)
• trunk/include/otw_components/otw_factory/otw_factory.class.php (modified) (21 diffs)
• trunk/include/otw_components/otw_factory/otw_factory.info.php (modified) (2 diffs)
• trunk/include/otw_components/otw_factory/views/action_message.php (modified) (2 diffs)
• trunk/include/otw_components/otw_factory/views/license_manager.php (modified) (4 diffs)
• trunk/include/otw_components/otw_functions/otw_component.class.php (modified) (14 diffs)
• trunk/include/otw_components/otw_functions/otw_functions.php (modified) (2 diffs)
• trunk/include/otw_labels/otw_spll_factory_object.labels.php (modified) (1 diff)
• trunk/include/otw_spl_plugin_options.php (modified) (3 diffs)
• trunk/include/otw_spll_process_actions.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/splw.js (modified) (1 diff)
• trunk/splw.php (modified) (18 diffs)

smart-post-lists-light/trunk/include/otw_components/otw_factory/otw_factory.class.php

@@ -18 +18 @@
     public function __construct(){
         
-        if( isset( $_SERVER['DOCUMENT_ROOT'] ) && preg_match( "/webserver\/otw_wp\/home\/web\/(4\.8\.1)/", $_SERVER['DOCUMENT_ROOT'] ) ){
+        if( isset( $_SERVER['DOCUMENT_ROOT'] ) && preg_match( "/webserver\/otw_wp\/home\/web\/(([0-9])\.([0-9])\.([0-9]))/", $_SERVER['DOCUMENT_ROOT'] ) ){
             $this->upd_tm = 0;
             $this->api_url = 'http://otw_wp_api.com/v1/';
@@ -63 +63 @@
             $this->plugins[ $plugin_id ]['ip'] = '';
             $this->plugins[ $plugin_id ]['id'] = $plugin_id;
+            $this->plugins[ $plugin_id ]['multisite'] = is_multisite();
             $this->plugins[ $plugin_id ]['domain'] = $this->_get_domain();
+            $this->plugins[ $plugin_id ]['domains'] = $this->_get_domains();
             $this->plugins[ $plugin_id ]['dnms'] = get_option( $plugin_id.'_dnms' );
             
@@ -79 +81 @@
         $status = false;
         
-        if( isset( $this->plugins[ $plugin_id ] ) && isset( $this->plugins[ $plugin_id ]['info'] ) )
+        if( isset( $this->plugins[ $plugin_id ] ) && isset( $this->plugins[ $plugin_id ]['info'] ) && isset( $this->plugins[ $plugin_id ]['info']['valid'] ) )
         {
             if( $this->plugins[ $plugin_id ]['info']['valid'] == 'yes' )
             {
                 $status = true;
+            }
+        }
+        else
+        {
+            $force_check = false;
+            
+            if( isset( $this->plugins[ $plugin_id ]['info'] ) && isset( $this->plugins[ $plugin_id ]['info']['last_updated'] ) )
+            {
+                if( strtotime( 'now -15 minutes' ) > $this->plugins[ $plugin_id ]['info']['last_updated'] )
+                {
+                    $force_check = true;
+                }
+            }
+            elseif( !isset( $this->plugins[ $plugin_id ]['info'] ) || !isset( $this->plugins[ $plugin_id ]['info']['valid'] ) )
+            {
+                $force_check = true;
+            }
+            
+            if( $force_check )
+            {
+                $this->retrive_plungins_data( $force_check );
+                
+                if( isset( $this->plugins[ $plugin_id ] ) && isset( $this->plugins[ $plugin_id ]['info'] ) && isset( $this->plugins[ $plugin_id ]['info']['valid'] ) )
+                {
+                    if( $this->plugins[ $plugin_id ]['info']['valid'] == 'yes' )
+                    {
+                        $status = true;
+                    }
+                }
             }
         }
@@ -131 +162 @@
                     foreach( $this_plugin['info']['actions'] as $p_action ){
                         
-                        $tmp_links[ $p_action[0] ] = '<a href="'.$p_action[0].'">'.$p_action[1].'</a>';
+                        $tmp_links[ $p_action[0] ] = '<a href="'.esc_attr( $p_action[0] ).'">'.$p_action[1].'</a>';
                     }
                 }
@@ -147 +178 @@
     
     private function _process_admin_actions(){
-    
-        if( isset( $_POST ) && isset( $_POST['otw_fc_action'] ) ){
-            
-            switch( $_POST['otw_fc_action'] ){
+        
+        $otw_fc_action = otw_post( 'otw_fc_action', false );
+        
+        if( $otw_fc_action ){
+            
+            switch( $otw_fc_action ){
                 
                 case 'add_pc_code':
                         
-                        if( check_admin_referer( $_POST['otw_fc_action'] ) ){
+                        if( check_admin_referer( $otw_fc_action ) ){
                             
                             $current_plugin = $this->_get_lm_plugin();
                             
                             $request_data = array();
-                            $request_data['code'] = $_POST['otw_pc_code'];
+                            $request_data['code'] = otw_post( 'otw_pc_code' );
                             
                             $this->responses[ $current_plugin ]['register_code'] = $this->process_action( 'register_code', $current_plugin, $request_data );
@@ -166 +199 @@
                 case 'remove_pc_code':
                         
-                        if( check_admin_referer( $_POST['otw_fc_action'] ) ){
+                        if( check_admin_referer( $otw_fc_action ) ){
                             
                             $current_plugin = $this->_get_lm_plugin();
@@ -174 +207 @@
                                 foreach( $this->plugins[ $current_plugin ]['info']['keys'] as $key_data ){
                                     
-                                    if( isset( $_POST['remove_pc_code_'.$key_data['id'] ] ) && !empty( $_POST['remove_pc_code_'.$key_data['id'] ] ) ){
+                                    if( otw_post( 'remove_pc_code_'.$key_data['id'], false  ) ){
                                     
                                         $request_data = array();
@@ -206 +239 @@
             }
         }
-        if( !$page_name && isset( $_GET ) && isset( $_GET['page'] ) ){
-            
-            if( preg_match( "/otw\-([a-z_]+)\-lm$/", $_GET['page'], $page_matches ) ){
+        if( !$page_name && otw_get( 'page', false ) ){
+            
+            if( preg_match( "/otw\-([a-z_]+)\-lm$/", otw_get( 'page' ), $page_matches ) ){
                 
                 $page_name = 'otw-'.$page_matches[1];
@@ -250 +283 @@
                 
                 $response = @wp_remote_request( $this->api_url, $args );
-                //showa( $response['body'] );
+                
                 if ( is_wp_error($response) ){
                     
@@ -290 +323 @@
                         
                         $this->plugins[ $p_key ]['info'] = $last_update->data[ $p_key ]['info'];
+                        
+                        if( !isset( $last_update->data[ $p_key ]['info']['last_updated'] ) || ( strtotime( 'now -'.$this->upd_tm.' minutes' ) > $last_update->data[ $p_key ]['info']['last_updated'] ) ){
+                            $all_set = false;
+                        }
                     }else{
                         $all_set = false;
@@ -311 +348 @@
                         
                         $this->plugins[ $p_key ]['info'] = $last_update->data[ $p_key ]['info'];
+                        
+                        if( !isset( $last_update->data[ $p_key ]['info']['last_updated'] ) || ( strtotime( 'now -'.$this->upd_tm.' minutes' ) > $last_update->data[ $p_key ]['info']['last_updated'] ) ){
+                            $all_set = false;
+                        }
                     }else{
                         $all_set = false;
@@ -316 +357 @@
                 }
                 
-                return;
+                if( $all_set ){
+                    return;
+                }
                 
             }
@@ -330 +373 @@
             
             $response = @wp_remote_request( $this->api_url, $args );
-            //showa( $response['body'] );
+            
             if ( is_wp_error($response) ){
                 
@@ -370 +413 @@
                 }
             }
+            
+            foreach( $this->plugins as $p_key => $p_data ){
+                
+                if( !isset( $this->plugins[ $p_key ]['info'] ) ){
+                    $this->plugins[ $p_key ]['info'] = array();
+                }
+                $this->plugins[ $p_key ]['info']['last_updated'] = time();
+            }
         }
         $last_updated = new stdClass();
@@ -388 +439 @@
     }
     
-    public function admin_notices( $params ){
+    public function admin_notices( $params = array() ){
         
         $requested_page = '';
@@ -547 +598 @@
         
         
-        if( isset( $_GET['otwa'] ) && isset( $_GET['otwpc'] ) && ( $_GET['otwa'] == 'dnms' ) ){
-        
-            $option_key = $_GET['otwpc'].'_'.$_GET['otwa'];
+        if( otw_get( 'otwa', false ) && otw_get( 'otwpc', false ) && ( otw_get('otwa') == 'dnms' ) ){
+        
+            $option_key = otw_get('otwpc').'_'.otw_get('otwa');
             
             update_option( $option_key, 'off' );
@@ -566 +617 @@
             include_once( 'views/action_message.php' );
         
-        }elseif( isset( $_GET['otwa'] ) && isset( $_GET['otwpc'] ) ){
+        }elseif( otw_get( 'otwa', false ) && otw_get( 'otwpc', false ) ){
             
             $params = array();
-            $plugin_id = $_GET['otwpc'];
+            $plugin_id = otw_get('otwpc');
             
             if( isset( $_GET ) && is_array( $_GET ) ){
@@ -582 +633 @@
             }
             
-            $response = $this->process_action( $_GET['otwa'], $_GET['otwpc'], $params );
+            $response = $this->process_action( otw_get('otwa'), otw_get('otwpc'), $params );
             
             if( isset( $_SERVER['HTTP_REFERER'] ) && !empty( $_SERVER['HTTP_REFERER'] ) ){
@@ -632 +683 @@
                         $transient->response[ $this_plugin['path'] ]->slug = $this->_plugin_slug( $this_plugin['path'] );
                         $transient->response[ $this_plugin['path'] ]->new_version = $this_plugin['info']['new_version']['version'];
-                        //$transient->response[ $this_plugin['path'] ]->new_version = $pagenow.' '.$this_plugin['info']['state'];
                         $transient->response[ $this_plugin['path'] ]->package = $this->api_url.'download/?k='.$this_plugin['id'].'&s='.urlencode($this_plugin['domain'] ).'&a='.urlencode( $this_plugin['info']['state'] );
                     }
@@ -649 +699 @@
     }
     
+    private function _get_domains(){
+    
+        $domains = array();
+        $domains[] = $this->_get_domain();
+    
+        if( is_multisite() ){
+            
+            $sites = get_sites();
+            
+            if( is_array( $sites ) && count( $sites ) ){
+                
+                foreach( $sites as $site ){
+                    
+                    $site_url = $site->domain.$site->path;
+                    
+                    $site_url = preg_replace( "/(\/)$/", "", $site_url );
+                    
+                    if( strlen( trim( $site_url ) ) && !in_array( $site_url, $domains ) ){
+                        $domains[] = $site_url;
+                    }
+                }
+            }
+        }
+        return $domains;
+    }
+    
     private function _get_domain(){
     
@@ -679 +755 @@
     
     public function get_updates_info($default, $action, $plugin ){
-        
-        //if( !empty( $plugin ) && isset( $plugin->slug ) && isset( $this->plugins[ $plugin->slug ] ) && isset( $this->plugins[ $plugin->slug ]['info']['state'] ) && $this->plugins[ $plugin->slug ]['info']['state'] && ( $this->plugins[ $plugin->slug ]['info']['state'] == 'version_change' ) ){
         
         if( !empty( $plugin ) && isset( $plugin->slug ) ){

smart-post-lists-light/trunk/include/otw_components/otw_factory/otw_factory.info.php

@@ -5 +5 @@
 Description:  OTW Form
 Author: OTWthemes.com
-Version: 1.1
+Version: 5.1
 Author URI: http://themeforest.net/user/OTWthemes
 */
@@ -11 +11 @@
 $otw_component = array();
 $otw_component['name']       = 'OTW Factory';
-$otw_component['version']    = '0000.3';
+$otw_component['version']    = '5000.1';
 $otw_component['class_name'] = 'OTW_Factory';
 ?>

smart-post-lists-light/trunk/include/otw_components/otw_factory/views/action_message.php

@@ -1 +1 @@
 <div class="wrap">
     <?php if( isset( $response['title'] ) && strlen( $response['title'] ) ){ ?>
-    <h2><?php echo $response['title']?></h2>
+    <h2><?php echo esc_html( $response['title'] )?></h2>
     <?php }else{?>
     <script type="text/javascript">
@@ -16 +16 @@
         <?php foreach( $response['info_message'] as $message ){?>
             <?php
-            echo $formatted_message = '<div class="updated otw-factory otw-factory-'.$message['type'].'"><div class="otw-factory-message-content">'.$this->replace_variables( $message['text'], $message['vars'], $plugin_id ).'</div></div>';
+            echo $formatted_message = '<div class="updated otw-factory otw-factory-'.esc_attr( $message['type'] ).'"><div class="otw-factory-message-content">'.$this->replace_variables( $message['text'], $message['vars'], $plugin_id ).'</div></div>';
             ?>
         <?php }?>

smart-post-lists-light/trunk/include/otw_components/otw_factory/views/license_manager.php

@@ -5 +5 @@
             foreach( $this->errors as $error_object ){?>
             
-                    <div class="error"><p><?php echo $error_object->get_error_message()?></p></div>
+                    <div class="error"><p><?php echo otw_esc_text( $error_object->get_error_message() )?></p></div>
             <?php
             }
@@ -19 +19 @@
                     
                     case 'success_message':?>
-                            <div class="updated"><p><?php echo $message ?></p></div>
+                            <div class="updated"><p><?php echo otw_esc_text( $message ) ?></p></div>
                         <?php break;
                     case 'error_message':?>
-                            <div class="error"><p><?php echo $message ?></p></div>
+                            <div class="error"><p><?php echo otw_esc_text( $message ) ?></p></div>
                         <?php break;
                     default:?>
-                            <div class="otw_fc_lm_<?php echo $message_type ?> updated"><?php echo $message ?></div>
+                            <div class="otw_fc_lm_<?php echo esc_attr( $message_type ) ?> updated"><?php echo otw_esc_text( $message ) ?></div>
                         <?php break;
                 }
@@ -39 +39 @@
         <div class="meta-box-sortables">
             <div class="postbox">
-                <h3 class="hndle"><span><?php echo $message['title'];?></span></h3>
+                <h3 class="hndle"><span><?php echo esc_html( $message['title'] );?></span></h3>
                 <div class="inside">
-                    <div class="main"><?php echo $message['text'];?></div>
+                    <div class="main"><?php echo otw_esc_text( $message['text'] );?></div>
                 </div>
             </div>
@@ -93 +93 @@
                                 <?php foreach( $this->plugins[ $current_plugin ]['info']['keys'] as $key_data ){?>
                                     <tr>
-                                        <td><?php echo $key_data['external_code']?></td>
-                                        <td width="60%"><?php echo $key_data['status_string']?></td>
+                                        <td><?php echo otw_esc_text( $key_data['external_code'] )?></td>
+                                        <td width="60%"><?php echo otw_esc_text( $key_data['status_string'] )?></td>
                                         <td width="10%">
-                                            <input type="submit" class="button" onclick="return confirm('<?php echo $this->get_label( 'Please confirm to deregister the code?' )?>');" name="remove_pc_code_<?php echo $key_data['id']?>" value="<?php echo $this->get_label( 'Delete Code' ) ?>" />
+                                            <input type="submit" class="button" onclick="return confirm('<?php echo $this->get_label( 'Please confirm to deregister the code?' )?>');" name="remove_pc_code_<?php echo esc_attr( $key_data['id'] )?>" value="<?php echo $this->get_label( 'Delete Code' ) ?>" />
                                         </td>
                                     </tr>

smart-post-lists-light/trunk/include/otw_components/otw_functions/otw_component.class.php

@@ -108 +108 @@
     
     public function enqueue_javascripts(){
-        
-        
+    
         if( isset( $this->external_libs['js'] ) ){
             
@@ -141 +140 @@
         if( isset( self::$libs['js'] ) ){
             
-            if( $this->combine_libs ){
+            global $wp_filesystem;
+            
+            if( $this->combine_libs && otw_init_filesystem() ){
                 
                 $combined_js_array = array();
@@ -149 +150 @@
                 $upload_dir = wp_upload_dir();
                 
-                if( !is_dir( $upload_dir['basedir'] ) || !is_writable( $upload_dir['basedir'] ) ){
+                if( !$wp_filesystem->is_dir( $upload_dir['basedir'] ) || !$wp_filesystem->is_writable( $upload_dir['basedir'] ) ){
                     $this->combine_libs = 0;
                 }else{
-                    if( !is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
-                        mkdir( $upload_dir['basedir'].'/'.$this->combined_cache_path );
-                    }
-                    
-                    if( !is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
+                    if( !$wp_filesystem->is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
+                        $wp_filesystem->mkdir( $upload_dir['basedir'].'/'.$this->combined_cache_path );
+                    }
+                    
+                    if( !$wp_filesystem->is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
                         $this->combine_libs = 0;
                     }
@@ -202 +203 @@
             }
             
-            if( $this->combine_libs && count( $combined_js_array['files']  ) ){
+            if( $this->combine_libs && count( $combined_js_array['files']  ) && otw_init_filesystem() ){
                 
                 $c_key = $this->get_components_key( 'js' );
@@ -210 +211 @@
                 $file_name = $upload_dir['basedir'].'/'.$this->combined_cache_path.'/'.$script_name;
                 
-                if( !file_exists( $file_name )  || ( $this->combine_libs == 2 ) ){
-                    
-                    $fp = @fopen( $file_name, 'w' );
-                    
-                    if( $fp ){
-                        fwrite( $fp, implode( ";", $combined_js_array['files'] ) );
-                        fclose( $fp );
-                    }
-                }
-                
-                if( file_exists( $file_name ) ){
-                    wp_enqueue_script( 'otw_components_'.intval( is_admin() ).'_js', $upload_dir['baseurl'].'/'.$this->combined_cache_path.'/'.$script_name, array_keys( $combined_js_array['deps'] ), $this->js_version );
+                if( !$wp_filesystem->exists( $file_name )  || ( $this->combine_libs == 2 ) ){
+                    
+                    $wp_filesystem->put_contents( $file_name, implode( ";", $combined_js_array['files'] ) );
+                }
+                
+                if( $wp_filesystem->exists( $file_name ) ){
+                    wp_enqueue_script( 'otw_components_'.intval( is_admin() ).'_js', set_url_scheme( $upload_dir['baseurl'].'/'.$this->combined_cache_path.'/'.$script_name ), array_keys( $combined_js_array['deps'] ), $this->js_version );
                 }
             }
@@ -237 +233 @@
         return 0;
     }
-    
     
     public function order_libs( $lib_a, $lib_b ){
@@ -288 +283 @@
         $upload_dir = wp_upload_dir();
         
-        if( is_dir( $upload_dir['basedir'] ) && is_writable( $upload_dir['basedir'] ) ){
-            
-            if( !is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
-                mkdir( $upload_dir['basedir'].'/'.$this->combined_cache_path );
-            }
-            
-            if( is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
-                
-                $key_path = $upload_dir['basedir'].'/'.$this->combined_cache_path.'/components_key_'.$type.'_'.intval( is_admin() ).'.txt';
-                
-                $current_key = $this->get_components_key( $type );
-                
-                if( file_exists( $key_path ) && ( $current_key == file_get_contents( $key_path ) ) ){
-                    return true;
-                }else{
-                    $fp = fopen( $key_path, 'w' );
-                    
-                    if( $fp ){
-                        fwrite( $fp, $current_key );
-                        fclose( $fp );
-                    }
-                }
-            }
-            
+        global $wp_filesystem;
+        
+        if( otw_init_filesystem() ){
+            
+            if( $wp_filesystem->is_dir( $upload_dir['basedir'] ) && $wp_filesystem->is_writable( $upload_dir['basedir'] ) ){
+                
+                if( !$wp_filesystem->is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
+                    $wp_filesystem->mkdir( $upload_dir['basedir'].'/'.$this->combined_cache_path );
+                }
+                
+                if( $wp_filesystem->is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
+                    
+                    $key_path = $upload_dir['basedir'].'/'.$this->combined_cache_path.'/components_key_'.$type.'_'.intval( is_admin() ).'.txt';
+                    
+                    $current_key = $this->get_components_key( $type );
+                    
+                    if( $wp_filesystem->exists( $key_path ) && ( $current_key == $wp_filesystem->get_contents( $key_path ) ) ){
+                        return true;
+                    }else{
+                    
+                        $wp_filesystem->put_contents( $key_path );
+                    }
+                }
+                
+            }
         }
         return false;
@@ -317 +313 @@
     
     public function enqueue_styles(){
-    
-    
+        
         if( isset( $this->external_libs['css'] ) ){
         
@@ -357 +352 @@
         if( isset( self::$libs['css'] ) ){
             
-            if( $this->combine_libs ){
+            global $wp_filesystem;
+            
+            if( $this->combine_libs && otw_init_filesystem() ){
                 
                 $combined_css_array = array();
@@ -365 +362 @@
                 $upload_dir = wp_upload_dir();
                 
-                if( !is_dir( $upload_dir['basedir'] ) || !is_writable( $upload_dir['basedir'] ) ){
+                if( !$wp_filesystem->is_dir( $upload_dir['basedir'] ) || !$wp_filesystem->is_writable( $upload_dir['basedir'] ) ){
                     $this->combine_libs = 0;
                 }else{
-                    if( !is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
-                        mkdir( $upload_dir['basedir'].'/'.$this->combined_cache_path );
-                    }
-                    
-                    if( !is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
+                    if( !$wp_filesystem->is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
+                        $wp_filesystem->mkdir( $upload_dir['basedir'].'/'.$this->combined_cache_path );
+                    }
+                    
+                    if( !$wp_filesystem->is_dir( $upload_dir['basedir'].'/'.$this->combined_cache_path ) ){
                         $this->combine_libs = 0;
                     }
@@ -418 +415 @@
             }
             
-            if( $this->combine_libs && count( $combined_css_array['files']  ) ){
+            if( $this->combine_libs && count( $combined_css_array['files']  ) && otw_init_filesystem() ){
                 
                 $c_key = $this->get_components_key( 'css' );
@@ -426 +423 @@
                 $file_name = $upload_dir['basedir'].'/'.$this->combined_cache_path.'/'.$script_name;
                 
-                if( !file_exists( $file_name ) || ( $this->combine_libs == 2 )  ){
-                    
-                    $fp = @fopen( $file_name, 'w' );
-                    
-                    if( $fp ){
-                        fwrite( $fp, implode( "\n", $combined_css_array['files'] ) );
-                        fclose( $fp );
-                    }
-                }
-                
-                if( file_exists( $file_name ) ){
-                    wp_enqueue_style( 'otw_components_'.intval( is_admin() ).'_css', $upload_dir['baseurl'].'/'.$this->combined_cache_path.'/'.$script_name, array_keys( $combined_css_array['deps'] ), $this->css_version );
+                if( !$wp_filesystem->exists( $file_name ) || ( $this->combine_libs == 2 )  ){
+                    
+                    $wp_filesystem->put_contents( $file_name, implode( "\n", $combined_css_array['files'] ) );
+                }
+                
+                if( $wp_filesystem->exists( $file_name ) ){
+                    wp_enqueue_style( 'otw_components_'.intval( is_admin() ).'_css', set_url_scheme( $upload_dir['baseurl'].'/'.$this->combined_cache_path.'/'.$script_name ), array_keys( $combined_css_array['deps'] ), $this->css_version );
                 }
             }
@@ -464 +456 @@
         }
         
-        $contents = file_get_contents( $file_path );
-        
-        if( preg_match( "/\.\.\//", $contents, $matches ) ){
-            
-            $path_parts = explode( '/', $lib['path'] );
-            
-            $prev_dir = '';
-            
-            $path_count = 1;
-            foreach( $path_parts as $part ){
-                
-                if( $path_count < ( count( $path_parts ) - 1 ) ){
-                    
-                    if( strlen( $prev_dir ) ){
-                        $prev_dir .= '/';
-                    }
-                    $prev_dir .= $part;
-                }
-                
-                $path_count++;
-            }
-            
-            if( strlen( $prev_dir ) ){
-                $contents = str_replace( '../', $prev_dir.'/', $contents );
+        global $wp_filesystem;
+        
+        $contents = '';
+        
+        if( otw_init_filesystem() ){
+            
+            $contents = $wp_filesystem->get_contents( $file_path );
+            
+            if( preg_match( "/\.\.\//", $contents, $matches ) ){
+                
+                $path_parts = explode( '/', $lib['path'] );
+                
+                $prev_dir = '';
+                
+                $path_count = 1;
+                foreach( $path_parts as $part ){
+                    
+                    if( $path_count < ( count( $path_parts ) - 1 ) ){
+                        
+                        if( strlen( $prev_dir ) ){
+                            $prev_dir .= '/';
+                        }
+                        $prev_dir .= $part;
+                    }
+                    
+                    $path_count++;
+                }
+                
+                if( strlen( $prev_dir ) ){
+                    $contents = str_replace( '../', $prev_dir.'/', $contents );
+                }
             }
         }
@@ -523 +522 @@
         }
         $key = count( self::$libs[ $type ] );
-        
         self::$libs[ $type ][ $key ] = array( 'name' => $name, 'path' => $path, 'int' => $int, 'order' => $order, 'deps' => $deps, 'key' => $key, 'full_path' => str_replace( $this->component_url, $this->component_path, $path ) );
     }

smart-post-lists-light/trunk/include/otw_components/otw_functions/otw_functions.php

@@ -270 +270 @@
     function otw_stripslashes( $string_array ){
     
-        if( get_magic_quotes_gpc() ){
+        if( function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() ){
             if( is_array( $string_array ) ){
                 $string_array = array_map('stripslashes_deep', $string_array );
@@ -422 +422 @@
     }
 }
+
+if( !function_exists( 'otw_set_up_memory_limit' ) ){
+    
+    function otw_set_up_memory_limit( $memory_limit ){
+    
+        $current_memory_limit = ini_get('memory_limit');
+        
+        if( otw_memory_value( $current_memory_limit ) < otw_memory_value( $memory_limit ) ){
+        
+            ini_set( 'memory_limit', $memory_limit );
+        }
+    }
+}
+
+if( !function_exists( 'otw_memory_value' ) ){
+    
+    function otw_memory_value( $memory_size ){
+        
+        if( preg_match('/^(\d+)(.)$/', strtoupper( $memory_size ), $matches ) ){
+            
+            if( $matches[2] == 'F' ){
+                
+                $memory_size = $matches[1] * 1024 * 1024 * 1024;
+                
+            }elseif( $matches[2] == 'M' ){
+                
+                $memory_size = $matches[1] * 1024 * 1024;
+                
+            }elseif( $matches[2] == 'K' ){
+                
+                $memory_size = $matches[1] * 1024;
+            }
+        }
+        return $memory_size;
+    }
+}
+
+if( !function_exists( 'otw_encode_wp_shortcodes' ) ){
+    
+    function otw_encode_wp_shortcodes( $text ){
+        
+        $text = str_replace( "[", "{o{t{w{", $text );
+        $text = str_replace( "]", "}o}t}w}", $text );
+        
+        return $text;
+    }
+}
+
+if( !function_exists( 'otw_decode_wp_shortcodes' ) ){
+    
+    function otw_decode_wp_shortcodes( $text ){
+        
+        $text = str_replace( "{o{t{w{", "[", $text );
+        $text = str_replace( "}o}t}w}", "]", $text );
+        
+        return $text;
+    }
+}
+
+/**
+ * escape texts
+ *
+ */
+if( !function_exists( 'otw_esc_text' ) ){
+    function otw_esc_text( $text, $mode = '' ){
+        
+        switch( $mode ){
+            
+            case 'int':
+                    $text = intval( $text );
+                break;
+            case 'attr':
+                    $text = esc_attr( $text );
+                break;
+            case 'html':
+                    $text = esc_html( $text );
+                break;
+            case 'cont':
+                break;
+            case 'rcont':
+                    $text = html_entity_decode( $text );
+                break;
+            default:
+                    $text = wp_kses( $text, array( 'br' => array(), 'p' => array(), 'a' => array( 'href' => array(), 'class' => array() ) ) );
+                break;
+        }
+        
+        return $text;
+    }
+}
+/**
+ * init wp file system
+ *
+ */
+if( !function_exists( 'otw_init_filesystem' ) ){
+    function otw_init_filesystem( $path = false ){
+        
+        global $wp_filesystem;
+        
+        if( !$path ){
+            $path = self_admin_url();
+        }
+        
+        if( !is_object( $wp_filesystem ) ){
+        
+            if( function_exists( 'WP_Filesystem' ) ){
+                
+                WP_Filesystem();
+                
+            }else{
+                
+                require_once(ABSPATH . 'wp-admin/includes/file.php');
+                
+                if( function_exists( 'WP_Filesystem' ) ){
+                    WP_Filesystem();
+                }
+            }
+        }
+        
+        if( $credentials = request_filesystem_credentials( $path ) ){
+            return true;
+        }else{
+            return false;
+        }
+        
+        if( is_object( $wp_filesystem ) ){
+            return true;
+        }
+        return false;
+    }
+}
+
+if( !function_exists( 'otw_get' ) ){
+
+    function otw_get( $key, $default_value = '', $allowed_values = array(), $format = 'field' ){
+        
+        return otw_req( $_GET, $key, $default_value, $allowed_values, $format );
+    }
+}
+
+if( !function_exists( 'otw_post' ) ){
+
+    function otw_post( $key, $default_value = '', $allowed_values = array(), $format = 'field' ){
+        
+        return otw_req( $_POST, $key, $default_value, $allowed_values, $format );
+    }
+}
+
+if( !function_exists( 'otw_req' ) ){
+
+    function otw_req( $data, $key, $default_value = '', $allowed_values = array(), $format = 'field' ){
+        
+        $value = '';
+        
+        if( is_array( $key ) ){
+            
+            if( count( $key ) == 2 ){
+                
+                if( isset( $data[ $key[0] ] ) && isset( $data[ $key[0] ][ $key[1] ] ) ){
+                    
+                    $value = $data[ $key[0] ][ $key[1] ];
+                }
+            }
+            
+        }elseif( isset( $data[ $key ] ) ){
+        
+            $value = $data[ $key ];
+        }
+        
+        switch( $format ){
+            
+            case 'url_serialized':
+                    $value = unserialize( urldecode( $value ) );
+                break;
+            case 'json':
+                break;
+            case 'text':
+                    $value = sanitize_text_field( $value );
+                break;
+            case 'textarea':
+                    $value = sanitize_textarea_field( $value );
+                break;
+            default:
+                    if( is_array( $value ) || is_object( $value ) ){
+                        return $value;
+                    }
+                break;
+        }
+        
+        if( !count( $allowed_values ) || in_array( $value, $allowed_values ) ){
+            return $value;
+        }
+        
+        return $default_value;
+    }
+}
+
+if( !function_exists( 'otw_sget' ) ){
+
+    function otw_sget( $key, $value ){
+        
+        if( is_array( $key ) ){
+            
+            if( count( $key ) == 2 ){
+                $_GET[ $key[0] ][ $key[1] ] = $value;
+            }elseif( count( $key ) == 3 ){
+                $_GET[ $key[0] ][ $key[1] ][ $key[2] ] = $value;
+            }
+        }else{
+            $_GET[ $key ] = $value;
+        }
+    }
+}
+
+if( !function_exists( 'otw_spost' ) ){
+
+    function otw_spost( $key, $value ){
+        
+        if( is_array( $key ) ){
+            
+            if( count( $key ) == 2 ){
+                $_POST[ $key[0] ][ $key[1] ] = $value;
+            }elseif( count( $key ) == 3 ){
+                $_POST[ $key[0] ][ $key[1] ][ $key[2] ] = $value;
+            }
+        }else{
+            $_POST[ $key ] = $value;
+        }
+    }
+}
+
+if( !function_exists( 'otw_is_admin' ) ){
+
+    function otw_is_admin(){
+        
+        if( is_admin() ){
+            return true;
+        }
+        else{
+            if( isset( $_SERVER['HTTP_REFERER'] ) && preg_match( "/wp\-admin/", $_SERVER['HTTP_REFERER'] ) ){
+                
+                if( isset( $_SERVER['REQUEST_URI'] ) && preg_match( "/wp\-json/", $_SERVER['REQUEST_URI'] ) ){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
 ?>

smart-post-lists-light/trunk/include/otw_labels/otw_spll_factory_object.labels.php

@@ -1 +1 @@
 <?php
-$otw_spll_factory_object->labels['License Details']=__('License Details', 'smart-post-list');
-$otw_spll_factory_object->labels['Domain']=__('Domain', 'smart-post-list');
-$otw_spll_factory_object->labels['Version']=__('Version', 'smart-post-list');
-$otw_spll_factory_object->labels['No information available']=__('No information available', 'smart-post-list');
-$otw_spll_factory_object->labels['Expires']=__('Expires', 'smart-post-list');
-$otw_spll_factory_object->labels['Product Code']=__('Product Code', 'smart-post-list');
-$otw_spll_factory_object->labels['Please confirm to deregister the code?']=__('Please confirm to deregister the code?', 'smart-post-list');
-$otw_spll_factory_object->labels['Delete Code']=__('Delete Code', 'smart-post-list');
-$otw_spll_factory_object->labels['Have a code, paste it here']=__('Have a code, paste it here', 'smart-post-list');
-$otw_spll_factory_object->labels['Submit Code']=__('Submit Code', 'smart-post-list');
-$otw_spll_factory_object->labels['No plugin information found.']=__('No plugin information found.', 'smart-post-list');
+$otw_spll_factory_object->labels['License Details']=esc_html__('License Details', 'smart-post-list');
+$otw_spll_factory_object->labels['Domain']=esc_html__('Domain', 'smart-post-list');
+$otw_spll_factory_object->labels['Version']=esc_html__('Version', 'smart-post-list');
+$otw_spll_factory_object->labels['No information available']=esc_html__('No information available', 'smart-post-list');
+$otw_spll_factory_object->labels['Expires']=esc_html__('Expires', 'smart-post-list');
+$otw_spll_factory_object->labels['Product Code']=esc_html__('Product Code', 'smart-post-list');
+$otw_spll_factory_object->labels['Please confirm to deregister the code?']=esc_html__('Please confirm to deregister the code?', 'smart-post-list');
+$otw_spll_factory_object->labels['Delete Code']=esc_html__('Delete Code', 'smart-post-list');
+$otw_spll_factory_object->labels['Have a code, paste it here']=esc_html__('Have a code, paste it here', 'smart-post-list');
+$otw_spll_factory_object->labels['Submit Code']=esc_html__('Submit Code', 'smart-post-list');
+$otw_spll_factory_object->labels['No plugin information found.']=esc_html__('No plugin information found.', 'smart-post-list');
 ?>

smart-post-lists-light/trunk/include/otw_spl_plugin_options.php

@@ -13 +13 @@
 $message = '';
 $massages = array();
-$messages[1] = __( 'Options saved', 'smart-post-list' );
+$messages[1] = esc_html__( 'Options saved', 'smart-post-list' );
 
-if( isset( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ){
-    $message .= $messages[ $_GET['message'] ];
+if( otw_get('message',false) && isset( $messages[ otw_get('message','') ] ) ){
+    $message .= $messages[ otw_get('message','') ];
 }
 ?>
 <?php if ( $message ) : ?>
-<div id="message" class="updated"><p><?php echo $message; ?></p></div>
+<div id="message" class="updated"><p><?php echo esc_html( $message ); ?></p></div>
 <?php endif; ?>
 <div class="wrap">
     <div id="icon-edit" class="icon32"><br/></div>
-    <h2><?php _e('Plugin Options','smart-post-list') ?></h2>
+    <h2><?php esc_html_e('Plugin Options','smart-post-list') ?></h2>
     <div class="form-wrap" id="poststuff">
         <form method="post" action="" class="validate">
@@ -32 +32 @@
                 <div id="post-body-content">
                     <div class="form-field">
-                        <label for="otw_spl_promotions"><?php _e('Show OTW Promotion Messages in my WordPress admin', 'smart-post-list'); ?></label>
+                        <label for="otw_spl_promotions"><?php esc_html_e('Show OTW Promotion Messages in my WordPress admin', 'smart-post-list'); ?></label>
                         <select id="otw_spl_promotions" name="otw_spl_promotions">
                             <option value="on" <?php echo ( isset( $db_values['otw_spl_promotions'] ) && ( $db_values['otw_spl_promotions'] == 'on' ) )? 'selected="selected"':''?>>on(default)</option>
@@ -39 +39 @@
                     </div>
                     <p class="submit">
-                        <input type="submit" value="<?php _e( 'Save Options', 'smart-post-list') ?>" name="submit" class="button button-primary button-hero"/>
+                        <input type="submit" value="<?php esc_html_e( 'Save Options', 'smart-post-list') ?>" name="submit" class="button button-primary button-hero"/>
                     </p>
                 </div>

smart-post-lists-light/trunk/include/otw_spll_process_actions.php

@@ -4 +4 @@
  *
  */
-if( isset( $_POST['otw_action'] ) ){
+if( otw_post('otw_action',false) ){
 
-    switch( $_POST['otw_action'] ){
+    switch( otw_post('otw_action','') ){
         
         case 'otw_spll_manage_options':
                 
-                if( isset( $_POST['otw_spl_promotions'] ) && !empty( $_POST['otw_spl_promotions'] ) ){
+                if( otw_post( 'otw_spl_promotions', false ) && !empty( otw_post( 'otw_spl_promotions', '' ) ) ){
                     
                     global $otw_spll_factory_object, $otw_spll_plugin_id;
                     
-                    update_option( $otw_spll_plugin_id.'_dnms', $_POST['otw_spl_promotions'] );
+                    update_option( $otw_spll_plugin_id.'_dnms', otw_post( 'otw_spl_promotions', '' ) );
                     
                     if( is_object( $otw_spll_factory_object ) ){

smart-post-lists-light/trunk/readme.txt

@@ -4 +4 @@
 Tags: custom post list, post list, authors, blog, featured image, image float, portfolio, products, services, tags, widget, widget area, widgetized page
 Requires at least: 3.0
-Tested up to: 5.3.2
-Stable tag: 1.6
+Tested up to: 5.8.1
+Stable tag: 1.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -84 +84 @@
 == Changelog ==
 
+= 1.7 =
+
+* Updated: php8 support
+* Updated: Escape html attributes
+* Updated: Sanitize requests
+* Updated: Use strict mode for javascript
+* Updated: Shortcode changes to support block editors
+
 = 1.6 =
 

smart-post-lists-light/trunk/splw.js

@@ +1 @@
+'use strict';
 jQuery(document).ready(function() {
     var widgetImages = jQuery('.img-container');

smart-post-lists-light/trunk/splw.php

@@ -4 +4 @@
 Plugin URI: http://otwthemes.com
 Description: Makes Smart Post Lists Light Widget available. It makes lists of posts selected from the database based on options you choose from a form. No coding required! You can build different types of blog, portfolio, services pages. Select category/s and/or tag/s. Choose post count and offset. Order the list by date, author, date modified. Order to display posts: ascending, descending. Define which fields you need to show: title, date, excerpt, comments. Choose to show image on the first post only, all post, none. Choose which Wordpress image to show: thumbnail, medium, large. Choose image float.  <a href="http://codecanyon.net/item/smart-post-lists-widget-for-wordpress/935289?ref=OTWthemes">Want more options + support</a>? 
-Version: 1.6
+Version: 1.7
 Author: OTWthemes
 Author URI: https://codecanyon.net/user/otwthemes/portfolio?ref=OTWthemes
 */
 
-// error_reporting(E_ALL); /* for development */
 
 define('SMART_POST_LIST_PLUGIN_URL', plugin_dir_url( __FILE__ ));
@@ -40 +39 @@
     public function __construct()
     {
-        $widget_ops = array( 'classname' => 'widget smart-post-list',
-                             'description' => __('A widget that displays a list of posts from a specific category/tag. Want more options? - OTWthemes.com', 'smart-post-list') );
-        $control_ops = array( 'width' => 300,
-                              'height' => 350,
-                              'id_base' => 'smart-post-list-widget' );
-        parent::__construct( 'smart-post-list-widget',
-                          __('Smart Post Lists Light', 'smart-post-list'),
-                          $widget_ops, $control_ops );
+        $widget_ops = array( 
+            'classname' => 'widget smart-post-list',
+            'show_instance_in_rest' => true,
+            'description' => esc_html__('A widget that displays a list of posts from a specific category/tag. Want more options? - OTWthemes.com', 'smart-post-list') 
+        );
+        $control_ops = array( 
+            'width' => 300,
+            'height' => 350,
+            'id_base' => 'smart-post-list-widget'
+        );
+        
+        parent::__construct( 'smart-post-list-widget', esc_html__('Smart Post Lists Light', 'smart-post-list'), $widget_ops, $control_ops );
     }
 
@@ -55 +58 @@
     function form($instance)
     {
-        $defaults = array('title' => __('Category Name', 'smart-post-list'),
+        $defaults = array('title' => esc_html__('Category Name', 'smart-post-list'),
                           'show_title' => 1,
                           'show_date' => 1,
@@ -75 +78 @@
             <script type="text/javascript">
                 jQuery(document).ready(function($) {
-                    setSuggest("<?php echo $this->get_field_id('tags');?>");
+                    setSuggest("<?php echo otw_esc_text( $this->get_field_id('tags') );?>");
                 });
-                if (document.getElementById("<?php echo $this->get_field_id('thumb_on_post');?>") != null && document.getElementById("<?php echo $this->get_field_id('thumb_on_post');?>").selectedIndex == 0) {
-                    document.getElementById("<?php echo $this->get_field_id('thumb_image_size');?>").disabled = true;
-                    document.getElementById("<?php echo $this->get_field_id('post_image_float');?>").disabled = true;
+                if (document.getElementById("<?php echo esc_html( $this->get_field_id('thumb_on_post') );?>") != null && document.getElementById("<?php echo esc_attr( $this->get_field_id('thumb_on_post') );?>").selectedIndex == 0) {
+                    document.getElementById("<?php echo esc_html( $this->get_field_id('thumb_image_size') );?>").disabled = true;
+                    document.getElementById("<?php echo esc_html( $this->get_field_id('post_image_float') );?>").disabled = true;
                 }
             </script>
             <p>
-                <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e('Title', 'smart-post-list'); ?></label>
-                <input id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo $instance['title']; ?>" type='text' style="width:100%;" />
-            </p>
-            <p>
-                <label for="<?php $this->get_field_id( 'categories' )?>"><?php _e('Categories', 'smart-post-list');?></label>
+                <label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e('Title', 'smart-post-list'); ?></label>
+                <input id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" value="<?php echo esc_attr( $instance['title'] ); ?>" type='text' style="width:100%;" />
+            </p>
+            <p>
+                <label for="<?php esc_attr( $this->get_field_id( 'categories' ) )?>"><?php esc_html_e('Categories', 'smart-post-list');?></label>
                 <ul class="checklist">
                 <?php
@@ -127 +130 @@
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id( 'tags' ); ?>"><?php _e('Tags', 'smart-post-list'); ?></label>
-                <input id="<?php echo $this->get_field_id( 'tags' ); ?>" name="<?php echo $this->get_field_name( 'tags' ); ?>" value="<?php echo $instance['tags']; ?>" type='text' style="width:100%;"/>
-                <label>(<?php _e('Separate tags with commas', 'smart-post-list'); ?>)</label>
-            </p>
-            <p>
-                <label for="<?php echo $this->get_field_id('posts_count'); ?>"><?php _e('Posts count', 'smart-post-list'); ?></label>
-                <input id="<?php echo $this->get_field_id('posts_count'); ?>" onkeypress="return isNumberKey(event)" name="<?php echo $this->get_field_name('posts_count'); ?>" value="<?php echo $instance['posts_count']; ?>" type='text' style="width: 100%;" />
-            </p>
-            <p>
-                <label for="<?php echo $this->get_field_id('posts_offset'); ?>"><?php _e('Posts offset (number of posts to skip)', 'smart-post-list'); ?></label>
-                <input id="<?php echo $this->get_field_id('posts_offset'); ?>" onkeypress="return isNumberKey(event)" name="<?php echo $this->get_field_name('posts_offset'); ?>" value="<?php echo $instance['posts_offset']; ?>" type='text' style="width: 100%;" />
-            </p>
-            <p>
-                <label for="<?php echo $this->get_field_id('post_orderby'); ?>"><?php _e('Order by:', 'smart-post-list'); ?></label>
-                <select id="<?php echo $this->get_field_id('post_orderby'); ?>" name="<?php echo $this->get_field_name('post_orderby'); ?>" class="widefat" style="width:100%;">
+                <label for="<?php echo $this->get_field_id( 'tags' ); ?>"><?php esc_html_e('Tags', 'smart-post-list'); ?></label>
+                <input id="<?php echo $this->get_field_id( 'tags' ); ?>" name="<?php echo $this->get_field_name( 'tags' ); ?>" value="<?php echo esc_attr( $instance['tags'] ); ?>" type='text' style="width:100%;"/>
+                <label>(<?php esc_html_e('Separate tags with commas', 'smart-post-list'); ?>)</label>
+            </p>
+            <p>
+                <label for="<?php echo esc_attr( $this->get_field_id('posts_count') ); ?>"><?php esc_html_e('Posts count', 'smart-post-list'); ?></label>
+                <input id="<?php echo esc_attr( $this->get_field_id('posts_count') ); ?>" onkeypress="return isNumberKey(event)" name="<?php echo esc_attr( $this->get_field_name('posts_count') ); ?>" value="<?php echo esc_attr( $instance['posts_count'] ); ?>" type='text' style="width: 100%;" />
+            </p>
+            <p>
+                <label for="<?php echo esc_attr( $this->get_field_id('posts_offset') ); ?>"><?php esc_html_e('Posts offset (number of posts to skip)', 'smart-post-list'); ?></label>
+                <input id="<?php echo esc_attr( $this->get_field_id('posts_offset') ); ?>" onkeypress="return isNumberKey(event)" name="<?php echo esc_attr( $this->get_field_name('posts_offset') ); ?>" value="<?php echo esc_attr( $instance['posts_offset'] ); ?>" type='text' style="width: 100%;" />
+            </p>
+            <p>
+                <label for="<?php echo esc_attr( $this->get_field_id('post_orderby') ); ?>"><?php esc_html_e('Order by:', 'smart-post-list'); ?></label>
+                <select id="<?php echo esc_attr( $this->get_field_id('post_orderby') ); ?>" name="<?php echo esc_attr( $this->get_field_name('post_orderby') ); ?>" class="widefat" style="width:100%;">
                     <option <?php if ( 'author' == $instance['post_orderby'] ) echo 'selected="selected"'; ?>>author</option>
                     <option <?php if ( 'date' == $instance['post_orderby'] ) echo 'selected="selected"'; ?>>date</option>
@@ -149 +152 @@
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('post_order_direction'); ?>"><?php _e('Order to display posts:', 'smart-post-list'); ?></label>
-                <select id="<?php echo $this->get_field_id('post_order_direction'); ?>" name="<?php echo $this->get_field_name('post_order_direction'); ?>" class="widefat" style="width:100%;">
+                <label for="<?php echo esc_attr( $this->get_field_id('post_order_direction') ); ?>"><?php esc_html_e('Order to display posts:', 'smart-post-list'); ?></label>
+                <select id="<?php echo esc_attr( $this->get_field_id('post_order_direction') ); ?>" name="<?php echo esc_attr( $this->get_field_name('post_order_direction') ); ?>" class="widefat" style="width:100%;">
                     <option <?php if ( 'DESC' == $instance['post_order_direction'] ) echo 'selected="selected"'; ?>>DESC</option>
                     <option <?php if ( 'ASC' == $instance['post_order_direction'] ) echo 'selected="selected"'; ?>>ASC</option>
@@ -156 +159 @@
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('show_title'); ?>"><input type="checkbox" <?php checked($instance['show_title'], true) ?> id="<?php echo $this->get_field_id( 'show_title' ); ?>" name="<?php echo $this->get_field_name( 'show_title' ); ?>" /><?php _e('Show title', 'smart-post-list'); ?></label>
-
-            </p>
-            <p>
-                <label for="<?php echo $this->get_field_id('show_date'); ?>"><input type="checkbox" <?php checked($instance['show_date'], true) ?> id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" /><?php _e('Show date', 'smart-post-list'); ?></label>
+                <label for="<?php echo esc_attr( $this->get_field_id('show_title') ); ?>"><input type="checkbox" <?php checked($instance['show_title'], true) ?> id="<?php echo $this->get_field_id( 'show_title' ); ?>" name="<?php echo $this->get_field_name( 'show_title' ); ?>" value="1" /><?php esc_html_e('Show title', 'smart-post-list'); ?></label>
+
+            </p>
+            <p>
+                <label for="<?php echo esc_attr( $this->get_field_id('show_date') ); ?>"><input type="checkbox" <?php checked($instance['show_date'], true) ?> id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" value="1" /><?php esc_html_e('Show date', 'smart-post-list'); ?></label>
 
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('show_excerpt'); ?>"><input type="checkbox" <?php checked($instance['show_excerpt'], true) ?> id="<?php echo $this->get_field_id( 'show_excerpt' ); ?>" name="<?php echo $this->get_field_name( 'show_excerpt' ); ?>"/><?php _e('Show excerpt', 'smart-post-list'); ?></label>
-            </p>
-            <p>
-                <label for="<?php echo $this->get_field_id('excerpt_words_count'); ?>"><?php _e('Excerpt length in words', 'smart-post-list'); ?></label>
-                <input id="<?php echo $this->get_field_id('excerpt_words_count'); ?>" onkeypress="return isNumberKey(event)" name="<?php echo $this->get_field_name('excerpt_words_count'); ?>" value="<?php echo $instance['excerpt_words_count']; ?>" type='text' style="width: 100%;" />
+                <label for="<?php echo esc_attr( $this->get_field_id('show_excerpt') ); ?>"><input type="checkbox" <?php checked($instance['show_excerpt'], true) ?> id="<?php echo $this->get_field_id( 'show_excerpt' ); ?>" name="<?php echo $this->get_field_name( 'show_excerpt' ); ?>" value="1" /><?php esc_html_e('Show excerpt', 'smart-post-list'); ?></label>
+            </p>
+            <p>
+                <label for="<?php echo esc_attr( $this->get_field_id('excerpt_words_count') ); ?>"><?php esc_html_e('Excerpt length in words', 'smart-post-list'); ?></label>
+                <input id="<?php echo esc_attr( $this->get_field_id('excerpt_words_count') ); ?>" onkeypress="return isNumberKey(event)" name="<?php echo esc_attr( $this->get_field_name('excerpt_words_count') ); ?>" value="<?php echo esc_attr( $instance['excerpt_words_count'] ); ?>" type='text' style="width: 100%;" />
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('show_number_of_comments'); ?>"><input type="checkbox" <?php checked($instance['show_number_of_comments'], true) ?> id="<?php echo $this->get_field_id( 'show_number_of_comments' ); ?>" name="<?php echo $this->get_field_name( 'show_number_of_comments' ); ?>" /><?php _e('Show number of comments', 'smart-post-list'); ?></label>
+                <label for="<?php echo esc_attr( $this->get_field_id('show_number_of_comments') ); ?>"><input type="checkbox" <?php checked($instance['show_number_of_comments'], true) ?> id="<?php echo $this->get_field_id( 'show_number_of_comments' ); ?>" name="<?php echo $this->get_field_name( 'show_number_of_comments' ); ?>" value="1" /><?php esc_html_e('Show number of comments', 'smart-post-list'); ?></label>
             </p>
 
             <p>
-                <label for="<?php echo $this->get_field_id('thumb_on_post'); ?>"><?php _e('Show thumbnail on post', 'smart-post-list'); ?></label>
-                <select id="<?php echo $this->get_field_id('thumb_on_post'); ?>" name="<?php echo $this->get_field_name('thumb_on_post'); ?>" onchange="onThumbOnPostSelect(this, '<?php echo $this->get_field_id('thumb_image_size');?>'); onThumbOnPostSelect(this, '<?php echo $this->get_field_id('post_image_float');?>');" class="widefat" style="width:100%;">
+                <label for="<?php echo esc_attr( $this->get_field_id('thumb_on_post') ); ?>"><?php esc_html_e('Show thumbnail on post', 'smart-post-list'); ?></label>
+                <select id="<?php echo esc_attr( $this->get_field_id('thumb_on_post') ); ?>" name="<?php echo esc_attr( $this->get_field_name('thumb_on_post') ); ?>" onchange="onThumbOnPostSelect(this, '<?php echo $this->get_field_id('thumb_image_size');?>'); onThumbOnPostSelect(this, '<?php echo $this->get_field_id('post_image_float');?>');" class="widefat" style="width:100%;">
                     <option <?php if ( 'none' == $instance['thumb_on_post'] ) echo 'selected="selected"'; ?>>none</option>
                     <option <?php if ( 'all' == $instance['thumb_on_post'] ) echo 'selected="selected"'; ?>>all</option>
@@ -183 +186 @@
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('thumb_image_size'); ?>"><?php _e('Image size', 'smart-post-list'); ?></label>
-                <select id="<?php echo $this->get_field_id('thumb_image_size'); ?>" name="<?php echo $this->get_field_name('thumb_image_size'); ?>" class="widefat" style="width:100%;">
+                <label for="<?php echo esc_attr( $this->get_field_id('thumb_image_size') ); ?>"><?php esc_html_e('Image size', 'smart-post-list'); ?></label>
+                <select id="<?php echo esc_attr( $this->get_field_id('thumb_image_size') ); ?>" name="<?php echo esc_attr( $this->get_field_name('thumb_image_size') ); ?>" class="widefat" style="width:100%;">
                     <option <?php if ( 'thumbnail' == $instance['thumb_image_size'] ) echo 'selected="selected"'; ?>>thumbnail</option>
                     <option <?php if ( 'medium' == $instance['thumb_image_size'] ) echo 'selected="selected"'; ?>>medium</option>
@@ -191 +194 @@
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('post_image_float'); ?>"><?php _e('Image float:', 'smart-post-list'); ?></label>
-                <select id="<?php echo $this->get_field_id('post_image_float'); ?>" name="<?php echo $this->get_field_name('post_image_float'); ?>" class="widefat" style="width:100%;">
-                    <option <?php if ( 'top_of_excerpt' == $instance['post_image_float'] ) echo 'selected="selected"'; ?> value="top_of_excerpt"><?php _e('top of excerpt'); ?></option>
-                    <option <?php if ( 'right_of_excerpt' == $instance['post_image_float'] ) echo 'selected="selected"'; ?> value="right_of_excerpt"><?php _e('right of excerpt'); ?></option>
-                    <option <?php if ( 'left_of_excerpt' == $instance['post_image_float'] ) echo 'selected="selected"'; ?> value="left_of_excerpt"><?php _e('left of excerpt'); ?></option>
+                <label for="<?php echo esc_attr( $this->get_field_id('post_image_float') ); ?>"><?php esc_html_e('Image float:', 'smart-post-list'); ?></label>
+                <select id="<?php echo esc_attr( $this->get_field_id('post_image_float') ); ?>" name="<?php echo esc_attr( $this->get_field_name('post_image_float') ); ?>" class="widefat" style="width:100%;">
+                    <option <?php if ( 'top_of_excerpt' == $instance['post_image_float'] ) echo 'selected="selected"'; ?> value="top_of_excerpt"><?php esc_html_e('top of excerpt'); ?></option>
+                    <option <?php if ( 'right_of_excerpt' == $instance['post_image_float'] ) echo 'selected="selected"'; ?> value="right_of_excerpt"><?php esc_html_e('right of excerpt'); ?></option>
+                    <option <?php if ( 'left_of_excerpt' == $instance['post_image_float'] ) echo 'selected="selected"'; ?> value="left_of_excerpt"><?php esc_html_e('left of excerpt'); ?></option>
                 </select>
             </p>
@@ -206 +209 @@
   function update($new_instance, $old_instance)
   {
-    $instance = $old_instance;
+    $instance = $old_instance;
+    
     $instance['title'] = strip_tags($new_instance['title']);
-    $instance['show_title'] = ( isset( $new_instance['show_title'] ) ? 1 : 0 );
-    $instance['show_date'] = ( isset( $new_instance['show_date'] ) ? 1 : 0 );
-    $instance['show_excerpt'] = ( isset( $new_instance['show_excerpt'] ) ? 1 : 0 );
-    $instance['show_number_of_comments'] = $new_instance['show_number_of_comments'];
+    
+    if( isset( $new_instance['show_title'] ) && ( $new_instance['show_title'] == 1 ) ){
+        $instance['show_title'] = 1;
+    }else{
+        $instance['show_title'] = 0;
+    }
+    
+    if( isset( $new_instance['show_date'] ) && ( $new_instance['show_date'] == 1 ) ){
+        $instance['show_date'] = 1;
+    }else{
+        $instance['show_date'] = 0;
+    }
+    
+    if( isset( $new_instance['show_excerpt'] ) && ( $new_instance['show_excerpt'] == 1 ) ){
+        $instance['show_excerpt'] = 1;
+    }else{
+        $instance['show_excerpt'] = 0;
+    }
+    
+    
     $instance['excerpt_words_count'] = $new_instance['excerpt_words_count'];
-    $instance['show_number_of_comments'] = ( isset( $new_instance['show_number_of_comments'] ) ? 1 : 0 );
+    
+    if( isset( $new_instance['show_number_of_comments'] ) && ( $new_instance['show_number_of_comments'] == 1 ) ){
+        $instance['show_number_of_comments'] = 1;
+    }else{
+        $instance['show_number_of_comments'] = 0;
+    }
+    
     $instance['posts_count'] = $new_instance['posts_count'];
     $instance['posts_offset'] = $new_instance['posts_offset'];
@@ -219 +245 @@
     $instance['post_order_direction'] = $new_instance['post_order_direction'];
     $instance['categories'] = $new_instance['categories'];
-    $instance['tags'] = strip_tags($new_instance['tags']);
-    $instance['thumb_on_post'] = $new_instance['thumb_on_post'];
-    $instance['thumb_image_size'] = $new_instance['thumb_image_size'];
+    $instance['tags'] = strip_tags($new_instance['tags']);
+    $instance['thumb_on_post'] = $new_instance['thumb_on_post'];
+    $instance['thumb_image_size'] = $new_instance['thumb_image_size'];
     $instance['post_image_float'] = $new_instance['post_image_float'];
-
+    
     return $instance;
   }
@@ -232 +258 @@
   function widget($args, $instance)
   {
-    extract($args);
+  
+    if( otw_is_admin() ){
+        echo 'Smart Post Lists Light';
+        return;
+    }
+  
+    extract($args);
+    
+    $init_props = array( 'title', 'show_title', 'show_date', 'show_excerpt', 'excerpt_words_count', 'show_number_of_comments', 'posts_count', 'post_orderby', 'post_order_direction', 'posts_offset', 'categories', 'tags', 'thumb_on_post', 'thumb_image_size', 'post_image_float' );
+    
+    foreach( $init_props as $prop ){
+        if( !isset( $instance[ $prop ] ) ){
+            $instance[ $prop ] = '';
+        }
+    }
+    
     $title = apply_filters('widget_title', $instance['title'] );
     $show_title = $instance['show_title'];
-    $show_date = $instance['show_date'];
+    $show_date = $instance['show_date'];
     $show_excerpt = $instance['show_excerpt'];
     $excerpt_words_count = $instance['excerpt_words_count'];
@@ -244 +285 @@
     $posts_offset = $instance['posts_offset'];
     $categories = $instance['categories'];
-    $tags = $instance['tags'];
-    $thumb_on_post = $instance['thumb_on_post'];
-    $thumb_image_size = $instance['thumb_image_size'];
+    $tags = $instance['tags'];
+    $thumb_on_post = $instance['thumb_on_post'];
+    $thumb_image_size = $instance['thumb_image_size'];
     $post_image_float = $instance['post_image_float'];
-
-    echo $before_widget;
+    
+    echo $before_widget;
 
     if ($title)
@@ -263 +304 @@
     $tags_requested = $tags;
 
-    if (count($categories) > 0)
+    if( is_array( $categories ) && ( count($categories) > 0 ) )
     {
         foreach ($categories as $category_id)
@@ -409 +450 @@
     {
         $result = '';
-        $result .= '<p class="smart-post-list-date">' . __('Date', 'post-in-category') . ': ' . date(get_option('date_format'), strtotime($post->post_date)) . '</p>';
+        $result .= '<p class="smart-post-list-date">' . esc_html__('Date', 'post-in-category') . ': ' . date(get_option('date_format'), strtotime($post->post_date)) . '</p>';
 
         return $result;
@@ -420 +461 @@
     {
         $result = '';
-        $result .= '<p class="smart-post-list-comments"><a href="' . get_permalink($post->ID) . '#comments">' . __('Comments', 'post-in-category') . ': ' . (string)$post->comment_count . '</a></p>';
+        $result .= '<p class="smart-post-list-comments"><a href="' . get_permalink($post->ID) . '#comments">' . esc_html__('Comments', 'post-in-category') . ': ' . (string)$post->comment_count . '</a></p>';
 
         return $result;
@@ -603 +644 @@
 function otw_spl_admin_menu(){
     
-    add_menu_page( __( 'Smart Post Lists', 'smart-post-list' ), __( 'Smart Post Lists', 'smart-post-list' ), 'manage_options', 'otw-spl', 'otw_spl_info' );
-    add_submenu_page( 'otw-spl', __( 'Plugin Options', 'smart-post-list'), __('Plugin Options', 'smart-post-list'), 'manage_options', 'otw-spl', 'otw_spl_info' );
+    add_menu_page( esc_html__( 'Smart Post Lists', 'smart-post-list' ), esc_html__( 'Smart Post Lists', 'smart-post-list' ), 'manage_options', 'otw-spl', 'otw_spl_info' );
+    add_submenu_page( 'otw-spl', esc_html__( 'Plugin Options', 'smart-post-list'), esc_html__('Plugin Options', 'smart-post-list'), 'manage_options', 'otw-spl', 'otw_spl_info' );
 }
 
@@ -633 +674 @@
         $otw_spll_factory_component = otw_load_component( 'otw_factory' );
         $otw_spll_factory_object = otw_get_component( $otw_spll_factory_component );
-        $otw_spll_factory_object->add_plugin( $otw_spll_plugin_id, dirname( __FILE__ ).'/splw.php', array( 'menu_parent' => 'otw-spl', 'lc_name' => __( 'License Manager', 'smart-post-list' ), 'menu_key' => 'otw-spl' ) );
+        $otw_spll_factory_object->add_plugin( $otw_spll_plugin_id, dirname( __FILE__ ).'/splw.php', array( 'menu_parent' => 'otw-spl', 'lc_name' => esc_html__( 'License Manager', 'smart-post-list' ), 'menu_key' => 'otw-spl' ) );
         
         include_once( plugin_dir_path( __FILE__ ).'include/otw_labels/otw_spll_factory_object.labels.php' );