Changeset 3200723

Timestamp:

12/02/2024 09:03:52 AM (15 months ago)

Author:

matthewrubin

Message:

Version update

Location:

local-magic

Files:

• tags/2.5.0/activate.php (modified) (5 diffs)
• tags/2.5.0/admin/setting.php (modified) (9 diffs)
• tags/2.5.0/include/function.php (modified) (8 diffs)
• tags/2.5.0/local-magic.php (modified) (30 diffs)
• tags/2.5.0/readme.txt (modified) (2 diffs)
• trunk/activate.php (modified) (5 diffs)
• trunk/admin/setting.php (modified) (9 diffs)
• trunk/include/function.php (modified) (8 diffs)
• trunk/local-magic.php (modified) (30 diffs)
• trunk/readme.txt (modified) (2 diffs)

local-magic/tags/2.5.0/activate.php

@@ -54 +54 @@
                 lm_multi_head text CHARACTER SET utf8 NULL,   
                 lm_multi_near_me text CHARACTER SET utf8 NULL,   
-                lm_is_topic tinyint(1) DEFAULT '0',   
-                lm_types varchar(20) CHARACTER SET utf8 DEFAULT 'single-type',   
                 PRIMARY KEY (id)
         );";
@@ -89 +87 @@
                 lm_assisted_living TEXT CHARACTER SET utf8 NULL,
                 lm_restaurant TEXT CHARACTER SET utf8 NULL,
-                lm_topics TEXT CHARACTER SET utf8 NULL,
-                lm_type varchar(50) CHARACTER SET utf8 NULL,
-                lm_is_default varchar(100) CHARACTER SET utf8 NULL,
-                lm_other_info TEXT CHARACTER SET utf8 NULL,
-                lm_neighbour_id int(11) NULL,
                 PRIMARY KEY (id)
         );";
@@ -202 +195 @@
             ;";
             $wpdb->query($setting_alter_sql_3);
-            
-        }
-    }
-    
-    //V 2.3
-    if ($wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE %s", $mrylm_setting_table)) === $mrylm_setting_table) {
-        
-        $setting_table_exist_4 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_setting_table' AND column_name = 'lm_is_topic'");
-        if (empty($setting_table_exist_4)) {
-            $setting_alter_sql_4 = "ALTER TABLE {$wpdb->prefix}mrylm_setting 
-            ADD `lm_is_topic` tinyint(1) NULL DEFAULT '0' AFTER `lm_multi_near_me`        
-            ;";
-            $wpdb->query($setting_alter_sql_4);
-            
-        }
-        
-        $setting_table_exist_5 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_setting_table' AND column_name = 'lm_types'");
-        if (empty($setting_table_exist_5)) {
-            $setting_alter_sql_5 = "ALTER TABLE {$wpdb->prefix}mrylm_setting 
-            ADD `lm_types` VARCHAR(30) NULL DEFAULT 'single-type' AFTER `lm_is_topic`        
-            ;";
-            $wpdb->query($setting_alter_sql_5);
-            
-        }        
+        }
     }
 
@@ -277 +245 @@
             $wpdb->query($cities_alter_sql_2);
         }
-        
-        
-        $cities_table_exist_3 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_topics'");
-        if (empty($cities_table_exist_3)) {
-            $cities_alter_sql_3 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_topics` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `lm_restaurant`
-            ;";
-            $wpdb->query($cities_alter_sql_3);
-        }
-        
-        $cities_table_exist_4 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_type'");
-        if (empty($cities_table_exist_4)) {
-            $cities_alter_sql_4 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_type` VARCHAR(30) NULL AFTER `lm_topics`
-            ;";
-            $wpdb->query($cities_alter_sql_4);
-        }
-        
-        
-        // city last update
-        $cities_table_exist_5 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_is_default'");
-        if (empty($cities_table_exist_5)) {
-            $cities_alter_sql_5 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_is_default` tinyint(1) NULL DEFAULT '0' AFTER `lm_type`,
-            ADD `lm_other_info` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `lm_is_default`
-            ;";
-            $wpdb->query($cities_alter_sql_5);
-        }
-        
-        // city last 2 update
-        $cities_table_exist_6 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_neighbour_id'");
-        if (empty($cities_table_exist_6)) {
-            $cities_alter_sql_6 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_neighbour_id` int(11) NULL DEFAULT '0' AFTER `lm_other_info`
-            ;";
-            $wpdb->query($cities_alter_sql_6);
-        }
-        
     }
 
     mrylm_create_tables();
-    
 }
 
-// OK
-function create_lm_page($lm_setting, $lm_city, $lm_page_url, $lm_post_ID = NULL){
-    
-    global $wpdb;
-        
-       // now we will create page for each city  
-        $lm_parent_post_id = url_to_postid($lm_page_url); 
-        
-        $lm_post_id = $lm_post_ID > 0 ? $lm_post_ID : url_to_postid($lm_page_url.$lm_city->lm_url_slug); 
-
-        if($lm_city->lm_parent_id > 0){                
-            $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
-            $lm_city_2 = $wpdb->get_row($lm_sql);
-            $lm_parent_post_id = url_to_postid($lm_page_url.$lm_city_2->lm_url_slug); 
-        }
-
-        // If there are no sub page then we hv to parent post id 0
-        if ($lm_setting->lm_page_type == 'base_page') {
-            $lm_parent_post_id = 0;
-        }
-  
-        $mrylm_post = array(
-          'ID'=>  $lm_post_id,
-          'post_title'    => $lm_city->lm_city,
-          'post_name'    => $lm_city->lm_slug,
-          'post_content'  => '',
-          'post_status'   => 'publish',
-          'post_type'   => 'page',
-          'post_parent'   => $lm_parent_post_id,
-          'post_author'   => 1,  
-          'post_category' => array()
-        );
-       
-
-        //Insert the post into the database            
-        $lm_insert_id =  $lm_post_id > 0 ? wp_update_post($mrylm_post) : wp_insert_post( $mrylm_post );
-
-        // to set template for the page 
-        if ( ! add_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php', true )) { 
-            update_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php' );
-        }
-        
-        return $lm_insert_id;
-}
-
-// OK
-function create_lm_topic_pages($lm_parent_post_id, $lm_setting, $lm_city_obj){
-     
-    
-    if($lm_setting->lm_is_topic && $lm_city_obj->lm_topics != ''){ 
-         
-        $topic_arr = explode('=',$lm_city_obj->lm_topics);
-                
-        if(is_array($topic_arr)){
-            foreach($topic_arr AS $topic){
-                
-                $data_arr = explode('|', $topic);
-                if(is_array($data_arr)){
-                    
-                    // $lm_setting->lm_page_url  == same as org_url + url type 
-                     $lm_post_id = url_to_postid($lm_setting->lm_page_url.$lm_city_obj->lm_url_slug.'/'.$data_arr[0]); 
-                                         
-                    $mrylm_post = array(
-                        'ID'=>  $lm_post_id,
-                        'post_title'    => $data_arr[1],
-                        'post_name'    => $data_arr[0],
-                        'post_content'  => '',
-                        'post_status'   => 'publish',
-                        'post_type'   => 'page',
-                        'post_parent'   => $lm_parent_post_id,
-                        'post_author'   => 1,
-                        'post_category' => array()
-                      );   
-
-                   // $lm_insert_id = wp_insert_post( $mrylm_post ); 
-                    $lm_insert_id =  $lm_post_id > 0 ? wp_update_post($mrylm_post) : wp_insert_post( $mrylm_post );
-                    // to set template for the page 
-                    if ( ! add_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php', true )) { 
-                        update_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php' );
-                    }                
-                }                
-            }
-        }
-    }    
-}
-
-// OK
-function delete_lm_topic_pages($lm_topics, $lm_page_url) {
-
-    if ($lm_topics != '') {
-
-        $topic_arr = explode('=',$lm_topics);
-
-        if (is_array($topic_arr)) {
-            
-            foreach ($topic_arr AS $topic) {
-
-                $data_arr = explode('|', $topic);
-                
-                if (is_array($data_arr)) {                               
-                    $postid = url_to_postid($lm_page_url . '/'.$data_arr[0]);
-                    if ($postid) {
-                        wp_delete_post($postid, true);
-                    }
-                }
-            }
-        }
-    }
-}
-
-// OK
 function create_service_area_page($lm_setting) {
 
@@ -453 +267 @@
         'post_type' => 'page',
         'post_parent' => 0,
-        'post_author'   => 1,
         'post_category' => array()
     );

local-magic/tags/2.5.0/admin/setting.php

@@ -8 +8 @@
 $mrylm_msg = "";
 
-
-function get_multi_type_formatted_data($multi_type_data = null){
-    
-    $array_data = array();
-    $text_data = json_decode($multi_type_data, true);
-    $array = explode('|', $text_data);
-    foreach($array as $value){
-
-        $arr = explode('=>', $value);
-        $array_data[$arr[0]] = $arr[1];
-    }
-    
-    return $array_data;
-}
-
 function mrylm_check_key_format($mrylm_key){
     
@@ -36 +21 @@
 }
 
+function get_multi_type_formatted_data($multi_type_data = null){
+    
+    $array_data = array();
+    $text_data = json_decode($multi_type_data, true);
+    $array = explode('|', $text_data);
+    foreach($array as $value){
+
+        $arr = explode('=>', $value);
+        $array_data[$arr[0]] = $arr[1];
+    }
+    
+    return $array_data;
+}
+
+function create_lm_pages($lm_setting, $lm_city, $lm_page_url){
+    
+    global $wpdb;
+    
+       // now we will create page for each city 
+        $lm_parent_post_id = url_to_postid($lm_page_url);  
+        $lm_post_id = url_to_postid($lm_page_url.$lm_city->lm_url_slug); 
+
+        if($lm_city->lm_parent_id > 0){                
+            $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
+            $lm_city_2 = $wpdb->get_row($lm_sql);
+            $lm_parent_post_id = url_to_postid($lm_page_url.$lm_city_2->lm_url_slug); 
+        }    
+
+        // If there are no sub page then we hv to parent post id 0
+        if ($lm_setting->lm_page_type == 'base_page') {
+            $lm_parent_post_id = 0;
+        }
+
+        $mrylm_post = array(
+          'ID'=>  $lm_post_id,
+          'post_title'    => $lm_city->lm_city,
+          'post_content'  => '',
+          'post_status'   => 'publish',
+          'post_type'   => 'page',
+          'post_parent'   => $lm_parent_post_id,
+          'post_category' => array()
+        );
+
+        //Insert the post into the database            
+        $lm_insert_id = wp_insert_post( $mrylm_post );
+
+        // to set template for the page 
+        if ( ! add_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php', true )) { 
+            update_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php' );
+        } 
+}
+
+
 function mrylm_process_pages(){
     
@@ -45 +83 @@
     if($lm_setting->lm_url_type == 'wp_remote_get'){        
         $mrylm_response   = wp_remote_get('https://localmagic.reviewmanager.app/plugin/cities/' . $lm_setting->lm_unique_id);
-        $mrylm_cities  = json_decode($mrylm_response['body']);        
+        $mrylm_cities  = json_decode($mrylm_response['body']);
+        
     }else{                 
         $mrylm_response = file_get_contents('https://localmagic.reviewmanager.app/plugin/cities/' . $lm_setting->lm_unique_id);
@@ -51 +90 @@
     }
      
-    if(!empty($mrylm_cities)){           
+       if(!empty($mrylm_cities)){           
          
          // Trancating existing Cities table
@@ -86 +125 @@
                 'lm_historic_landmark' => $obj->historic_landmark,
                 'lm_assisted_living' => $obj->assisted_living,
-                'lm_restaurant' => $obj->restaurant,
-                'lm_topics' => $obj->topics,
-                'lm_type' => $obj->lm_type,
-                'lm_is_default' => $obj->is_default,
-                'lm_other_info' => $obj->other_info,    
-                'lm_neighbour_id' => $obj->neighbour_id 
+                'lm_restaurant' => $obj->restaurant
             );
 
@@ -99 +133 @@
             $lm_city = array();
             $lm_city['lm_parent_id'] = $obj->parent_id;
-            $lm_city['lm_type'] = $obj->lm_type;
-            $lm_city['lm_slug'] = $obj->slug;
             $lm_city['lm_url_slug'] = $obj->url_slug;
             $lm_city['lm_city'] = $obj->city;
-            $lm_city['lm_topics'] = $obj->topics;
             $lm_obj_city = (object) $lm_city; 
             
             // need to process multi type
-             if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
+             if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
 
                 $lm_multi_titles = get_multi_type_formatted_data($lm_setting->lm_multi_title);
@@ -113 +144 @@
 
                     $lm_page_url = $lm_setting->lm_org_url.$key.'/';
-                    $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                    create_lm_pages($lm_setting, $lm_obj_city, $lm_page_url);    
                 }
 
-            }else if($lm_setting->lm_types == 'type-wise'){
-                
-                if($lm_obj_city->lm_type){
-                    $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/'; 
-                    $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-                }
-                
-            }else{ // single type city
-                
-                $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);              
+            }else{
+                create_lm_pages($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
             }            
         }
@@ -140 +158 @@
     }   
 }
+
 
 if (isset($_POST['submit']) && is_user_logged_in()) {
@@ -226 +245 @@
                     'lm_multi_keyword' => $lm_setting->multi_keyword,
                     'lm_multi_head' => $lm_setting->multi_head,
-                    'lm_multi_near_me' => $lm_setting->multi_near_me,
-                    'lm_is_topic' => $lm_setting->is_topic,
-                    'lm_types' => $lm_setting->lm_types
+                    'lm_multi_near_me' => $lm_setting->multi_near_me
                 );
 

local-magic/tags/2.5.0/include/function.php

@@ -9 +9 @@
 }
 
-
 function get_multi_type_data($multi_type_data = null){
     
@@ -24 +23 @@
 }
 
-
 function mrylm_get_city(){
     
     global $wpdb;
+    
+    $url  = get_permalink();
+    $arr  = explode('/', trim($url, '/'));
+    $slug = end($arr);   
+    $prev = prev($arr); 
+    
+    $full_slug = $prev.'/'.$slug;
     
     $lm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
     $lm_setting     = $wpdb->get_row($lm_setting_sql);
-    
-    $url  = get_permalink();
-    $arr  = explode('/', trim($url, '/'));
-    
-    $slug = end($arr);   
-    $prev = prev($arr); 
-    $lm_type = ''; //$arr[4]; 
-    
-    
-    // This [4] is depends on url format
-    if($lm_setting->lm_is_topic){
-        if(count($arr) > 4){ // there are topic
-            $slug = $arr[4];  
-        }    
-    }
-     
     if ($lm_setting->lm_org_url == $url) {
-        $slug = $lm_setting->lm_default_city;
+        $full_slug = $lm_setting->lm_default_city;
     }    
     
-    $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_slug = '$slug'";
-    if($lm_type){
-         $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_slug = '$slug'  AND lm_type = '$lm_type'";
+    $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_url_slug = '$full_slug'";
+    $lm_city = $wpdb->get_row($lm_sql);
+    
+    if(empty($lm_city)){
+        $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_url_slug = '$slug'";
+        $lm_city = $wpdb->get_row($lm_sql);
     } 
-    $lm_city = $wpdb->get_row($lm_sql);     
     
     return $lm_city;
@@ -311 +302 @@
   
         $content = file_get_contents($lm_setting->lm_template_other_path.'/lm-'.$url_slug.'-content.php');
-    }
-    
-    
-     // Widget Part
-    if($lm_setting->lm_is_topic && $lm_city->lm_topics != ''){
-      
-        $topic_widget = '';
-        $topic_arr = json_decode($lm_city->lm_topics);
-
-        if(is_array($topic_arr)){
-            foreach($topic_arr AS $topic){
-               $data_arr = explode('|', $topic); 
-               $topic_url = $lm_setting->lm_page_url . $lm_city->lm_url_slug . '/' .$data_arr[0]; 
-               $topic_widget .= '<a class="btn lm-hero-btn" href="'.$topic_url.'"><span>'.$data_arr[1].'</span></a>';
-            }   
-        }
-        
-       if($topic_widget != ''){
-           $content = str_replace('TOPIC_WIDGET', $topic_widget, $content);
-       }else{
-           $content = str_replace('TOPIC_WIDGET', '', $content);
-       } 
-       
-    }
-    // URL CUSTOM  END
-    
-    
-    
-    // process POI  widget
-    if($lm_setting->lm_is_point_of_interest){
-        
-        
-        $poi_data = mrylm_poi($type = ''); 
-        $content = str_replace('POI_FEED', $poi_data, $content);
-        
-    }
-    
+    }   
     
     
@@ -406 +361 @@
     $reviews = mrylm_review_testimonial($lm_city); 
     $content = str_replace('REVIEW_FEED', $reviews, $content);
-        
+    
+    
+    // process POI  widget
+    if($lm_setting->lm_is_point_of_interest){
+        $poi_data = mrylm_poi($type = ''); 
+        $content = str_replace('POI_FEED', $poi_data, $content);
+    }
+    
     return $content;  
     
@@ -484 +446 @@
 
             // Set img title  and alt attributes
-            $title_text = ucwords(trim($img_keyword_arr[$counter]).' '.$city.', '.$state);
+            $title_text = ucwords($img_keyword_arr[$counter].' '.$city.', '.$state);
             $image->setAttribute('alt', $title_text);
             $image->setAttribute('title', $title_text);
@@ -700 +662 @@
         // get news data as per keyword   
         $lm_news = mrylm_get_news_list($lm_setting, $lm_city);
-        $data .= mrylm_get_list_data($lm_setting, $lm_news, $lm_city);
-       
+
+        if($lm_setting->lm_display_type == 'list'){
+            $data .= mrylm_get_list_data($lm_setting, $lm_news, $lm_city);
+        }else if($lm_setting->lm_display_type == 'accordion'){
+            $data .= mrylm_get_accordion_data($lm_setting, $lm_news, $lm_city);
+        }
 
         $style =  '<style>';
@@ -832 +798 @@
 }
    
+function mrylm_get_accordion_data($lm_setting, $lm_news, $lm_city){
+        
+    $separator  = 'in';         
+    $data = ''; 
+
+    $data .= '<div class="lm-accordion-container">';
+
+            if(isset($lm_news) && !empty($lm_news)){
+
+                $data .= '<h2 class="lm-widget-title">'.$lm_setting->lm_head_line.' '.$separator.' '. $lm_city->lm_city .', '. $lm_city->lm_state .'</h2>';
+                
+                // foreach start
+                $data .= '<div class="lm-accordion-inner">';
+
+                foreach($lm_news as $obj){
+
+                    $detail  = trim(preg_replace("/<figure[^>]*>(.+?)<\/figure>/", "", $obj->lm_news)); 
+                    $detail  = trim(preg_replace("/<iframe[^>]*>(.+?)<\/iframe>/", "", $detail)); 
+                    $detail  = trim(preg_replace("/<img[^>]*>(.+?)<\/img>/", "", $detail)); 
+                    $detail  = preg_replace('/(<a\b[^><]*)>/i', '$1 rel="nofollow;" target="_blank">',$detail);
+
+                    $active = 'none;';
+                    $active_class = '';
+
+                    if($key == 0){$active_class = 'lm-active';  $active = 'block;'; } 
+
+                   $author = $obj->lm_author ? $obj->lm_author :  $obj->lm_source;
+                   $source = $obj->lm_source ? $obj->lm_source : $lm_setting->lm_org_name;
+
+                    $data .= '<div class="lm-accordion-item" itemscope itemtype="http://schema.org/NewsArticle">';
+                        $data .= '<meta itemscope itemprop="mainEntityOfPage"  itemType="https://schema.org/WebPage" itemid="'.$obj->lm_detail_url.'"/>';
+                        $data .= '<h2 class="lm-accordion-title '.$active_class.'"  itemprop="headline">'.$obj->lm_title.'</h2>';
+                        $data .= '<h3 style="display:none;" itemprop="author" itemscope itemtype="https://schema.org/Person">';
+                            $data .= '<span itemprop="name">'.$author.'</span>';
+                            $data .= '<span itemprop="url">'.$obj->lm_detail_url.'</span>';
+                        $data .= '</h3>';
+                        $data .= '<div class="lm-accordion-content" style="display:'.$active.'">';
+                            $data .= '<div class="lm-read-less"><p>'. strip_tags(substr($detail, 0, 550)). '...</p></div>';                               
+                            $data .= '<div class="lm-read-more" itemprop="description">'. $detail. '</div>';  
+                            $data .= '<button class="lm-btn">Read more</button>';
+                        $data .= '</div>';
+
+                        $data .= '<div itemprop="image" itemscope itemtype="https://schema.org/ImageObject">   
+                                        <meta itemprop="url" content="'.$lm_setting->lm_org_logo_url.'">   
+                                      </div>';
+                        $data .= '<div itemprop="publisher" itemscope itemtype="https://schema.org/Organization">
+                                    <div itemprop="logo" itemscope itemtype="https://schema.org/ImageObject">      
+                                      <meta itemprop="url" content="'.$lm_setting->lm_org_logo_url.'">      
+                                    </div>
+                                    <meta itemprop="name" content="'.$source.'">
+                                  </div>';
+                        $data .= '<meta itemprop="datePublished" content="'.date('Y-m-d H:i:s', strtotime($obj->lm_created_at)).'"/>';
+                        $data .= '<meta itemprop="dateModified" content="'.date('Y-m-d H:i:s', strtotime($obj->lm_updated_at)).'"/>';
+
+                    $data .= '</div>';
+                }
+
+                $data .= '</div>';
+
+            }else{
+                $data .= ''; '<div class="news-block">No news data found.</div>';
+            }        
+
+    $data .= '</div>';
+
+    return $data;
+    
+}
+    
 function mrylm_review_testimonial($lm_city = null){      
     
@@ -1405 +1440 @@
 
 /* Job End */
+
 
 /* POI Start */

local-magic/tags/2.5.0/local-magic.php

@@ -12 +12 @@
  * Plugin Name:       Local Magic
  * Plugin URI:        https://www.mrmarketingres.com/local-magic
- * Description:       The Local Magic© WordPress plugin extends the functionality of the SaaS Local Magic© to WordPress so that the local news feed can be displayed on the WordPress website. The plugin is for customers of Local Magic© that have an active subscription with the company.
+ * Description:       The Local Magic® WordPress plugin extends the functionality of the SaaS Local Magic® to WordPress so that the local news feed can be displayed on the WordPress website. The plugin is for customers of Local Magic® that have an active subscription with the company.
  * Version:           2.5.0
  * Requires at least: 3.5.1
- * Tested up to:      6.3.0
+ * Tested up to:      6.7.1
  * Requires PHP:      5.6.0
  * Author:            matthewrubin
@@ -27 +27 @@
     exit; // Exit if accessed directly
 
-
-define('MRYLM_VERSION', '2.4.0');
+define('MRYLM_VERSION', '2.5.0');
 
 define('MRYLM_PLUGIN_DIR', plugin_dir_path(__FILE__));
@@ -51 +50 @@
 /* ACTION START */
 
-function mrylm_enqueue_scripts() {  
-    
-   // wp_enqueue_style('owl.carousel.min.css', plugin_dir_url(__FILE__) . 'assets/css/owl.carousel.min.css', array(), '0.1.0', 'all');
-   // wp_register_script('owl.carousel.min.js', plugin_dir_url(__FILE__) . 'assets/js/owl.carousel.min.js', '', FALSE, TRUE);
-   // wp_enqueue_script('owl.carousel.min.js');    
+function mrylm_enqueue_scripts() {   
 }
 add_action('wp_enqueue_scripts', 'mrylm_enqueue_scripts');
-
 
 function mrylm_admin_menu() {
@@ -67 +61 @@
 add_action('admin_menu', 'mrylm_admin_menu');
 
-
 function mrylm_options() {
 
@@ -79 +72 @@
 
 /* UPDATE ACTION START */
+add_action( 'upgrader_process_complete', 'mrylm_upgrade_function',10, 2);
 function mrylm_upgrade_function( $upgrader_object, $options ) {
     
-   // require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-   // mrylm_update_tables();
-}
-add_action( 'upgrader_process_complete', 'mrylm_upgrade_function',10, 2);
+    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
+    mrylm_update_tables();
+}
 /* UPDATE ACTION END */
 
@@ -94 +87 @@
 add_shortcode('mrylm-article', 'mrylm_article_shortcode');
 
-
 function mrylm_dropdown_menu_shortcode($attr, $content) {
     return mrylm_dropdown_menu($content);
@@ -127 +119 @@
 /* SHORT CODE END */
 
-
 // DESTROY LM
-/* Manage/ Destroy Page data Start  Done*/
+/* Manage/ Destroy Page data Start */
 add_action('wp_ajax_nopriv_mrylm-manage-pages', 'mrylm_manage_pages');
-
 function mrylm_manage_pages() {
 
     global $wpdb;
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();
     
     $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
@@ -146 +134 @@
     if (isset($lm_cities) && $lm_cities != '') {
         
-        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
-            
+        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
             $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
             foreach($lm_multi_titles AS $key=>$lm_title){
@@ -153 +140 @@
                     $postid = url_to_postid($lm_setting->lm_org_url. $key.'/'. $obj->lm_url_slug);
                     if ($postid) {
-                        $parent_url = $lm_setting->lm_org_url. $key.'/'. $obj->lm_url_slug;
-                        delete_lm_topic_pages($obj->lm_topics, $parent_url);
                         wp_delete_post($postid, true);
                     }
@@ -160 +145 @@
             }
             
-        }else if($lm_setting->lm_types == 'type-wise'){
-            
-            foreach ($lm_cities as $obj) {
-                $lm_page_url = $lm_setting->lm_org_url.$obj->lm_type.'/'.$obj->lm_url_slug;                  
-                $postid = url_to_postid($lm_page_url);
-                if ($postid) {
-                    delete_lm_topic_pages($obj->lm_topics, $lm_page_url);
-                    wp_delete_post($postid, true);
-                } 
-            } 
-            
         }else{
             foreach ($lm_cities as $obj) {
                 $postid = url_to_postid($lm_setting->lm_page_url . $obj->lm_url_slug);
                 if ($postid) {
-                    $parent_url = $lm_setting->lm_page_url . $obj->lm_url_slug;
-                    delete_lm_topic_pages($obj->lm_topics, $parent_url);
-                    wp_delete_post($postid, true);                    
+                    wp_delete_post($postid, true);
                 }
             }
@@ -209 +181 @@
 
 
-/* Update Setting data Start Done */
+/* Update Setting data Start */
 add_action('wp_ajax_nopriv_mrylm-update-setting', 'mrylm_update_setting');
 
@@ -275 +247 @@
             'lm_multi_keyword' => $lm_setting->multi_keyword,
             'lm_multi_head' => $lm_setting->multi_head,
-            'lm_multi_near_me' => $lm_setting->multi_near_me,
-            'lm_is_topic' => $lm_setting->is_topic,
-            'lm_types' => $lm_setting->lm_types
+            'lm_multi_near_me' => $lm_setting->multi_near_me
         );
 
@@ -290 +260 @@
 
 
-/* Manage Cities data Start Pore Hobe */
+/* Manage Cities data Start */
 add_action('wp_ajax_nopriv_mrylm-manage-cities', 'mrylm_manage_cities');
 function mrylm_manage_cities() {
-    
+
+    // functional code will go here    
+    $lm_cities = $_POST['cities'];
     require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
     mrylm_update_tables();
-    $lm_cities = $_POST['cities'];
      
     if (isset($lm_cities)) {
@@ -338 +309 @@
                 'lm_historic_landmark' => $obj->historic_landmark,
                 'lm_assisted_living' => $obj->assisted_living,
-                'lm_restaurant' => $obj->restaurant,
-                'lm_topics' => $obj->topics,
-                'lm_type' => $obj->lm_type,
-                'lm_is_default' => $obj->is_default,
-                'lm_other_info' => $obj->other_info,    
-                'lm_neighbour_id' => $obj->neighbour_id 
+                'lm_restaurant' => $obj->restaurant
             );
 
@@ -351 +317 @@
             $lm_city = array();
             $lm_city['lm_parent_id'] = $obj->parent_id;
-            $lm_city['lm_type'] = $obj->lm_type;
-            $lm_city['lm_slug'] = $obj->slug;
             $lm_city['lm_url_slug'] = $obj->url_slug;
             $lm_city['lm_city'] = $obj->city;
-            $lm_city['lm_topics'] = $obj->topics;
             $lm_obj_city = (object) $lm_city; 
 
-            if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
+            if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
 
                 $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
@@ -364 +327 @@
 
                     $lm_page_url = $lm_setting->lm_org_url.$key.'/';
-                    $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                    create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);    
                 }
 
-            }else if($lm_setting->lm_types == 'type-wise'){
-                if($lm_obj_city->lm_type){              
-                    $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/'; 
-                    $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-                }
-                
-            }else{                
-                
-                $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+            }else{
+                create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
             }
-        }        
+
+        }
+        
     }
     
@@ -396 +349 @@
 
 
-/* Manage Typewise city Start */
-add_action('wp_ajax_nopriv_mrylm-manage-typewise-cities', 'mrylm_manage_typewise_cities');
-function mrylm_manage_typewise_cities() {
-    
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();
+/* Add single type cities data Start */
+add_action('wp_ajax_nopriv_mrylm-manage-single-types', 'mrylm_manage_single_types');
+function mrylm_manage_single_types() {
+
+    // functional code will go here    
     $lm_cities = $_POST['cities'];
-    $lm_type = $_POST['lm_type'];
-        
+    $lm_url_type = $_POST['lm_type'];
+     
+
     if (isset($lm_cities)) {
 
@@ -411 +364 @@
         $lm_cities = json_decode($lm_cities);
         
-        $lm_del_sql = "DELETE FROM {$wpdb->prefix}mrylm_cities WHERE lm_type = '$lm_type'";
-        $wpdb->query($lm_del_sql);
-
         $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
         $lm_setting = $wpdb->get_row($mrylm_setting_sql);
-                
-        foreach ($lm_cities as $obj) {
-
-            $city = stripslashes($obj->city);
-            $data_arr = array(
-                'lm_city_id' => $obj->id,
-                'lm_parent_id' => $obj->parent_id,
-                'lm_city' => $city,
-                'lm_state' => $obj->state,
-                'lm_slug' => $obj->slug,
-                'lm_url_slug' => $obj->url_slug,
-                'lm_google_map_id' => $obj->google_map_id,
-                'lm_form_id' => $obj->form_id,
-                'lm_city_keyword_separator' => $obj->city_keyword_separator,
-                'lm_location' => $obj->location,
-                'lm_city_phone' => $obj->city_phone,
-                'lm_city_mayor' => $obj->city_mayor,
-                'lm_population' => $obj->population,
-                'lm_avg_home_value' => $obj->avg_home_value,
-                'lm_avg_household_income' => $obj->avg_household_income,
-                'lm_avg_temperature' => $obj->avg_temperature,
-                'lm_price_range' => $obj->price_range,
-                'lm_image' => $obj->image,
-                'lm_description' => $obj->description,
-                'lm_telephone' => $obj->telephone,
-                'lm_educational_institution' => $obj->educational_institution,
-                'lm_state_park' => $obj->state_park,
-                'lm_historic_landmark' => $obj->historic_landmark,
-                'lm_assisted_living' => $obj->assisted_living,
-                'lm_restaurant' => $obj->restaurant,
-                'lm_topics' => $obj->topics,
-                'lm_type' => $obj->lm_type,
-                'lm_is_default' => $obj->is_default,
-                'lm_other_info' => $obj->other_info,
-                'lm_neighbour_id' => $obj->neighbour_id
-            );
-
-            $mrylm_table_name = $wpdb->prefix . "mrylm_cities";
-            $wpdb->insert($mrylm_table_name, $data_arr);
-
-            $lm_city = array();
-            $lm_city['lm_parent_id'] = $obj->parent_id;
-            $lm_city['lm_type'] = $obj->lm_type;
-            $lm_city['lm_slug'] = $obj->slug;
-            $lm_city['lm_url_slug'] = $obj->url_slug;
-            $lm_city['lm_city'] = $obj->city;
-            $lm_city['lm_topics'] = $obj->topics;
-            $lm_obj_city = (object) $lm_city; 
-                 
-            
-            $lm_page_url = $lm_setting->lm_org_url.$lm_type.'/';
-            $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-            
-            $lm_setting->lm_page_url = $lm_page_url;
-            // need to delete old/existing topic pages before create Topic page
-            create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-            
-        }        
-    }
-    
-    // for service area page page
-    if($lm_setting->lm_is_service_area_page){        
-        create_service_area_page($lm_setting);
-    } 
-    
-    echo TRUE;
-}
-
-/* Manage Typewise city Start End */
-
-
-/* Add single type cities data Start */
-add_action('wp_ajax_nopriv_mrylm-manage-single-types', 'mrylm_manage_single_types');
-function mrylm_manage_single_types() {
-
-    // functional code will go here    
-    $lm_cities = $_POST['cities'];
-    $lm_url_type = $_POST['lm_type'];     
-
-    if (isset($lm_cities)) {
-
-        global $wpdb;
+        
+        // we can create parent page , LM type page
         require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
         mrylm_update_tables();
-        
-        $lm_cities = stripcslashes(str_replace('\"', '"', $lm_cities));
-        $lm_cities = json_decode($lm_cities);
-        
-        $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
-        $lm_setting = $wpdb->get_row($mrylm_setting_sql);
-                    
+        $lm_page_url = $lm_setting->lm_org_url.$lm_url_type.'/';
+         
         foreach ($lm_cities as $obj) {
             
@@ -512 +377 @@
             $city = array();
             $city['lm_parent_id'] = $obj->parent_id;
-            $city['lm_type'] = $obj->lm_type;
-            $city['lm_slug'] = $obj->slug;
             $city['lm_url_slug'] = $obj->url_slug;
             $city['lm_city'] = $city_name;
-            $city['lm_topics'] = $obj->topics;;
             $lm_city = (object) $city; 
 
             if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
                
-                $lm_page_url = $lm_setting->lm_org_url.$lm_url_type.'/';
-                $insert_id = create_lm_page($lm_setting, $lm_city, $lm_page_url);
-                $lm_setting->lm_page_url = $lm_page_url;
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_city);
+                create_lm_page($lm_setting, $lm_city, $lm_page_url);
             }
         }        
@@ -534 +393 @@
 
 
-/* Add City data Start Done */
+/* Add City data Start*/
 add_action('wp_ajax_nopriv_mrylm-add-city', 'mrylm_add_city');
 function mrylm_add_city() {
 
     $lm_city = $_POST['city'];
-    
-    // we can create parent page , LM type page
-    global $wpdb;
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();
-   
+    mrylm_upgrade_function(array(), array());
     
     if (isset($lm_city)) {
@@ -550 +404 @@
         $lm_city = json_decode($lm_city);
 
+        global $wpdb;
 
         $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
@@ -581 +436 @@
             'lm_historic_landmark' => $lm_city->historic_landmark,
             'lm_assisted_living' => $lm_city->assisted_living,
-            'lm_restaurant' => $lm_city->restaurant,
-            'lm_topics' => $lm_city->topics,
-            'lm_type' => $lm_city->lm_type,
-            'lm_is_default' => $lm_city->is_default,
-            'lm_other_info' => $lm_city->other_info,
-            'lm_neighbour_id' => $lm_city->neighbour_id
+            'lm_restaurant' => $lm_city->restaurant
         );
         $mrylm_table_name = $wpdb->prefix . "mrylm_cities";
@@ -594 +444 @@
         $obj = array();
         $obj['lm_parent_id'] = $lm_city->parent_id;
-        $obj['lm_slug'] = $lm_city->slug;
         $obj['lm_url_slug'] = $lm_city->url_slug;
         $obj['lm_city'] = $lm_city->city;
-        $obj['lm_type'] = $lm_city->lm_type;
-        $obj['lm_topics'] = $lm_city->topics;
-        $lm_obj_city = (object) $obj;
-              
+        $lm_obj_city = (object) $obj; 
+        
         // now process multi page         
-        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''  && $lm_setting->lm_types == 'multi-type'){
+        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
 
             $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
-           
             foreach($lm_multi_titles AS $key=>$lm_title){
 
                 $lm_page_url = $lm_setting->lm_org_url.$key.'/';
-               
-                $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url); 
-                $lm_setting->lm_page_url = $lm_page_url;
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);    
             }
 
-        }else if($lm_setting->lm_types == 'type-wise'){
-              
-            
-            if($lm_obj_city->lm_type){
-                $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/'; 
-                $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                $lm_setting->lm_page_url = $lm_page_url;
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-            }
-            
-                    
         }else{
-            $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
-            create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);            
+            create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
         } 
     }
@@ -634 +465 @@
 /* Add City data End*/
 
-
-/* Update City data Start Done*/
+function create_lm_page($lm_setting, $lm_city, $lm_page_url){
+    
+     global $wpdb;
+     
+    // now we will create page for each city 
+    $lm_parent_post_id = url_to_postid($lm_page_url);                
+    $lm_post_id  = url_to_postid($lm_page_url . $lm_city->lm_url_slug);
+
+    if ($lm_city->lm_parent_id > 0) {
+        $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
+        $lm_city_2 = $wpdb->get_row($lm_sql);
+        $lm_parent_post_id = url_to_postid($lm_page_url. $lm_city_2->lm_url_slug);
+    }
+
+    // If there are no sub page then we hv to parent post id 0
+    if ($lm_setting->lm_page_type == 'base_page') {
+        $lm_parent_post_id = 0;
+    }
+
+    $mrylm_post = array(
+        'ID' => $lm_post_id,
+        'post_title' => $lm_city->lm_city,
+        'post_content' => '',
+        'post_status' => 'publish',
+        'post_type' => 'page',
+        'post_parent' => $lm_parent_post_id,
+        'post_category' => array()
+    );
+
+    //Insert the post into the database            
+    $lm_insert_id = wp_insert_post($mrylm_post);
+
+    // to set template for the page 
+    if (!add_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php', true)) {
+        update_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php');
+    }
+}
+
+/* Update City data Start*/
 add_action('wp_ajax_nopriv_mrylm-update-city', 'mrylm_update_city');
 function mrylm_update_city() {
 
     $lm_city = $_POST['city'];
-    
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();   
+    mrylm_upgrade_function(array(), array());
     
     if (isset($lm_city)) {
@@ -659 +525 @@
         
         // Update city data        
-        $city = stripslashes($lm_city->city);       
-               
-        $wpdb->update( 
-            $wpdb->prefix.'mrylm_cities', 
-            array( 
-                'lm_parent_id' => $lm_city->parent_id, 
-                'lm_city' => $city, 
-                'lm_state' => $lm_city->state,
-                'lm_slug' => $lm_city->slug,
-                'lm_url_slug' => $lm_city->url_slug,
-                'lm_google_map_id' => $lm_city->google_map_id,
-                'lm_form_id' => $lm_city->form_id,
-                'lm_city_keyword_separator' => $lm_city->city_keyword_separator,
-                'lm_location' => $lm_city->location,
-                'lm_city_phone' => $lm_city->city_phone,    
-                'lm_city_mayor' => $lm_city->city_mayor,    
-                'lm_population' => $lm_city->population,    
-                'lm_avg_home_value' => $lm_city->avg_home_value,    
-                'lm_avg_household_income' => $lm_city->avg_household_income,    
-                'lm_avg_temperature' => $lm_city->avg_temperature,    
-                'lm_price_range' => $lm_city->price_range,    
-                'lm_image' =>  $lm_city->image,    
-                'lm_description' => $lm_city->description,    
-                'lm_telephone' => $lm_city->telephone,    
-                'lm_educational_institution' =>  $lm_city->educational_institution,    
-                'lm_state_park' => $lm_city->state_park,    
-                'lm_historic_landmark' => $lm_city->historic_landmark,   
-                'lm_assisted_living' => $lm_city->assisted_living,  
-                'lm_restaurant' => $lm_city->restaurant,   
-                'lm_topics' => $lm_city->topics,  
-                'lm_type' => $lm_city->lm_type,
-                'lm_is_default' => $lm_city->is_default,
-                'lm_other_info' => $lm_city->other_info,
-                'lm_neighbour_id' => $lm_city->neighbour_id
-            ), 
-            array( 'lm_city_id' => $lm_city->id )
-        );
-       
-        $obj = array();      
+        $city = stripslashes($lm_city->city);        
+        $data_arr = "UPDATE {$wpdb->prefix}mrylm_cities
+                        SET lm_parent_id = '" . $lm_city->parent_id . "', 
+                        lm_city = '" . $city . "', 
+                        lm_state = '" . $lm_city->state . "',
+                        lm_slug = '" . $lm_city->slug . "',
+                        lm_url_slug = '" . $lm_city->url_slug . "',
+                        lm_google_map_id = '" . $lm_city->google_map_id . "',
+                        lm_form_id = '" . $lm_city->form_id . "',
+                        lm_city_keyword_separator = '" . $lm_city->city_keyword_separator . "',
+                        lm_location = '" . $lm_city->location . "',
+                        lm_city_phone = '" . $lm_city->city_phone . "',    
+                        lm_city_mayor = '" . $lm_city->city_mayor . "',    
+                        lm_population = '" . $lm_city->population . "',    
+                        lm_avg_home_value = '" . $lm_city->avg_home_value . "',    
+                        lm_avg_household_income = '" . $lm_city->avg_household_income . "',    
+                        lm_avg_temperature = '" . $lm_city->avg_temperature . "',    
+                        lm_price_range = '" . $lm_city->price_range . "',    
+                        lm_image = '" . $lm_city->image . "',    
+                        lm_description = '" . $lm_city->description . "',    
+                        lm_telephone = '" . $lm_city->telephone . "',    
+                        lm_educational_institution = '" . $lm_city->educational_institution . "',    
+                        lm_state_park = '" . $lm_city->state_park . "',    
+                        lm_historic_landmark = '" . $lm_city->historic_landmark . "',   
+                        lm_assisted_living = '" . $lm_city->assisted_living . "' ,  
+                        lm_restaurant = '" . $lm_city->restaurant . "'   
+                    WHERE lm_city_id = " . $lm_city->id . "";
+
+        $wpdb->query($data_arr);
+         
+        $obj = array();
         $obj['lm_parent_id'] = $lm_city->parent_id;
-        $obj['lm_slug'] = $lm_city->slug;
         $obj['lm_url_slug'] = $lm_city->url_slug;
         $obj['lm_city'] = $lm_city->city;
-        $obj['lm_type'] = $lm_city->lm_type;
-        $obj['lm_topics'] = $lm_city->topics;
         $lm_obj_city = (object) $obj; 
-         
-        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''  && $lm_setting->lm_types == 'multi-type'){
+        
+        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
                     
             $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
@@ -713 +568 @@
                 $lm_page_url = $lm_setting->lm_org_url.$key.'/';             
                 $lm_post_id = url_to_postid($lm_page_url . $lm_city_old->lm_url_slug);                
-                $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url, $lm_post_id);  
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                update_lm_page($lm_setting, $lm_obj_city, $lm_page_url, $lm_post_id);    
             }
-            
-        }else if($lm_setting->lm_types == 'type-wise'){
-                
-                if($lm_obj_city->lm_type){
-                    $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/';                  
-                    $lm_post_id = url_to_postid($lm_page_url . $lm_city_old->lm_url_slug);                 
-                    $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url, $lm_post_id);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-                }
 
         }else{            
             
             $lm_post_id = url_to_postid($lm_setting->lm_page_url . $lm_city_old->lm_url_slug);            
-            $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url, $lm_post_id);
-            create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-        }        
+            update_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url, $lm_post_id);
+        }
+                
+        // now we will create page for city 
+        
     }
 }
 /* Update City data End */
 
-/* Manage News data Start  */
+function update_lm_page($lm_setting, $lm_city, $lm_page_url, $lm_post_id){
+    
+    global $wpdb;    
+    
+    $lm_parent_post_id = url_to_postid($lm_page_url);  
+       
+    if($lm_city->lm_parent_id > 0){                
+        $lm_sql_2 = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
+        $lm_city_2 = $wpdb->get_row($lm_sql_2);
+        $lm_parent_post_id = url_to_postid($lm_page_url.$lm_city_2->lm_url_slug); 
+    }  
+
+    // If there are no sub page then we hv to parent post id 0
+    if ($lm_setting->lm_page_type == 'base_page') {
+        $lm_parent_post_id = 0;
+    }
+
+    $mrylm_post = array(
+        'ID' => $lm_post_id,
+        'post_title' => $lm_city->lm_city,
+        'post_name' => $lm_city->lm_url_slug,
+        'post_content' => '',
+        'post_status' => 'publish',
+        'post_type' => 'page',
+        'post_parent' => $lm_parent_post_id,
+        'post_category' => array()
+    );
+    
+    //Insert the post into the database            
+    $lm_insert_id = wp_update_post($mrylm_post);
+
+    // to set template for the page 
+    if (!add_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php', true)) {
+        update_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php');
+    }        
+}
+
+
+/* Manage News data Start */
 add_action('wp_ajax_nopriv_mrylm-manage-news', 'mrylm_manage_news');
 function mrylm_manage_news() {
@@ -787 +671 @@
     }
 
-    echo TRUE;    
+    echo TRUE;
+    
 }
 /* Manage News data End */
 
 
-/* Delete a City Start Done */
+/* Delete a City Start */
 add_action('wp_ajax_nopriv_mrylm-delete-city', 'mrylm_delete_city');
 function mrylm_delete_city() {
 
     global $wpdb;
-    
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
     $lm_city_id = $_POST['city_id'];
 
@@ -813 +696 @@
     $wpdb->query($lm_del_news_sql);
     
-    if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
+    if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
                 
         $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
@@ -819 +702 @@
            $postid = url_to_postid($lm_setting->lm_org_url. $key.'/'. $lm_city->lm_url_slug);
             if ($postid) {
-                $parent_url = $lm_setting->lm_org_url. $key.'/'. $lm_city->lm_url_slug;
-                delete_lm_topic_pages($lm_city->lm_topics, $parent_url);
-                wp_delete_post($postid, true); 
+                wp_delete_post($postid, true);                
             }
-        }        
-        
-    }else if($lm_setting->lm_types == 'type-wise'){ 
-        
-        if($lm_city->lm_type){
-            
-            $lm_page_url = $lm_setting->lm_org_url.$lm_city->lm_type.'/'.$lm_city->lm_url_slug;                  
-            $postid = url_to_postid($lm_page_url);
-            if ($postid) {
-                delete_lm_topic_pages($lm_city->lm_topics, $lm_page_url);
-                wp_delete_post($postid, true);
-            } 
         }
         
@@ -841 +710 @@
         $postid = url_to_postid($lm_setting->lm_page_url . $lm_city->lm_url_slug);
         if ($postid) {
-            $parent_url = $lm_setting->lm_page_url . $lm_city->lm_url_slug;
-            delete_lm_topic_pages($lm_city->lm_topics, $parent_url);
-            wp_delete_post($postid, true);
+            wp_delete_post($postid, true);           
         }        
     }

local-magic/tags/2.5.0/readme.txt

@@ -9 +9 @@
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-The Local Magic© WordPress plugin extends the functionality of the SaaS Local Magic© to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic© that have an active subscription with the company.
+The Local Magic® WordPress plugin extends the functionality of the SaaS Local Magic® to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic® that have an active subscription with the company.
 
 == Description ==
 
-The Local Magic© WordPress plugin extends the functionality of the SaaS Local Magic© to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic© that have an active subscription with the company.
+The Local Magic® WordPress plugin extends the functionality of the SaaS Local Magic® to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic® that have an active subscription with the company.
 
  
@@ -103 +103 @@
 =2.3.0= 
 1. Bug fixing and Some minor functionality added
-=2.4.0= 
-1. Topic feature added
-=2.5.0= 
-1. Re-arrange functionality

local-magic/trunk/activate.php

@@ -54 +54 @@
                 lm_multi_head text CHARACTER SET utf8 NULL,   
                 lm_multi_near_me text CHARACTER SET utf8 NULL,   
-                lm_is_topic tinyint(1) DEFAULT '0',   
-                lm_types varchar(20) CHARACTER SET utf8 DEFAULT 'single-type',   
                 PRIMARY KEY (id)
         );";
@@ -89 +87 @@
                 lm_assisted_living TEXT CHARACTER SET utf8 NULL,
                 lm_restaurant TEXT CHARACTER SET utf8 NULL,
-                lm_topics TEXT CHARACTER SET utf8 NULL,
-                lm_type varchar(50) CHARACTER SET utf8 NULL,
-                lm_is_default varchar(100) CHARACTER SET utf8 NULL,
-                lm_other_info TEXT CHARACTER SET utf8 NULL,
-                lm_neighbour_id int(11) NULL,
                 PRIMARY KEY (id)
         );";
@@ -202 +195 @@
             ;";
             $wpdb->query($setting_alter_sql_3);
-            
-        }
-    }
-    
-    //V 2.3
-    if ($wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE %s", $mrylm_setting_table)) === $mrylm_setting_table) {
-        
-        $setting_table_exist_4 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_setting_table' AND column_name = 'lm_is_topic'");
-        if (empty($setting_table_exist_4)) {
-            $setting_alter_sql_4 = "ALTER TABLE {$wpdb->prefix}mrylm_setting 
-            ADD `lm_is_topic` tinyint(1) NULL DEFAULT '0' AFTER `lm_multi_near_me`        
-            ;";
-            $wpdb->query($setting_alter_sql_4);
-            
-        }
-        
-        $setting_table_exist_5 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_setting_table' AND column_name = 'lm_types'");
-        if (empty($setting_table_exist_5)) {
-            $setting_alter_sql_5 = "ALTER TABLE {$wpdb->prefix}mrylm_setting 
-            ADD `lm_types` VARCHAR(30) NULL DEFAULT 'single-type' AFTER `lm_is_topic`        
-            ;";
-            $wpdb->query($setting_alter_sql_5);
-            
-        }        
+        }
     }
 
@@ -277 +245 @@
             $wpdb->query($cities_alter_sql_2);
         }
-        
-        
-        $cities_table_exist_3 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_topics'");
-        if (empty($cities_table_exist_3)) {
-            $cities_alter_sql_3 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_topics` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `lm_restaurant`
-            ;";
-            $wpdb->query($cities_alter_sql_3);
-        }
-        
-        $cities_table_exist_4 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_type'");
-        if (empty($cities_table_exist_4)) {
-            $cities_alter_sql_4 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_type` VARCHAR(30) NULL AFTER `lm_topics`
-            ;";
-            $wpdb->query($cities_alter_sql_4);
-        }
-        
-        
-        // city last update
-        $cities_table_exist_5 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_is_default'");
-        if (empty($cities_table_exist_5)) {
-            $cities_alter_sql_5 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_is_default` tinyint(1) NULL DEFAULT '0' AFTER `lm_type`,
-            ADD `lm_other_info` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `lm_is_default`
-            ;";
-            $wpdb->query($cities_alter_sql_5);
-        }
-        
-        // city last 2 update
-        $cities_table_exist_6 = $wpdb->get_results("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE table_name = '$mrylm_cities_table' AND column_name = 'lm_neighbour_id'");
-        if (empty($cities_table_exist_6)) {
-            $cities_alter_sql_6 = "ALTER TABLE {$wpdb->prefix}mrylm_cities 
-            ADD `lm_neighbour_id` int(11) NULL DEFAULT '0' AFTER `lm_other_info`
-            ;";
-            $wpdb->query($cities_alter_sql_6);
-        }
-        
     }
 
     mrylm_create_tables();
-    
 }
 
-// OK
-function create_lm_page($lm_setting, $lm_city, $lm_page_url, $lm_post_ID = NULL){
-    
-    global $wpdb;
-        
-       // now we will create page for each city  
-        $lm_parent_post_id = url_to_postid($lm_page_url); 
-        
-        $lm_post_id = $lm_post_ID > 0 ? $lm_post_ID : url_to_postid($lm_page_url.$lm_city->lm_url_slug); 
-
-        if($lm_city->lm_parent_id > 0){                
-            $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
-            $lm_city_2 = $wpdb->get_row($lm_sql);
-            $lm_parent_post_id = url_to_postid($lm_page_url.$lm_city_2->lm_url_slug); 
-        }
-
-        // If there are no sub page then we hv to parent post id 0
-        if ($lm_setting->lm_page_type == 'base_page') {
-            $lm_parent_post_id = 0;
-        }
-  
-        $mrylm_post = array(
-          'ID'=>  $lm_post_id,
-          'post_title'    => $lm_city->lm_city,
-          'post_name'    => $lm_city->lm_slug,
-          'post_content'  => '',
-          'post_status'   => 'publish',
-          'post_type'   => 'page',
-          'post_parent'   => $lm_parent_post_id,
-          'post_author'   => 1,  
-          'post_category' => array()
-        );
-       
-
-        //Insert the post into the database            
-        $lm_insert_id =  $lm_post_id > 0 ? wp_update_post($mrylm_post) : wp_insert_post( $mrylm_post );
-
-        // to set template for the page 
-        if ( ! add_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php', true )) { 
-            update_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php' );
-        }
-        
-        return $lm_insert_id;
-}
-
-// OK
-function create_lm_topic_pages($lm_parent_post_id, $lm_setting, $lm_city_obj){
-     
-    
-    if($lm_setting->lm_is_topic && $lm_city_obj->lm_topics != ''){ 
-         
-        $topic_arr = explode('=',$lm_city_obj->lm_topics);
-                
-        if(is_array($topic_arr)){
-            foreach($topic_arr AS $topic){
-                
-                $data_arr = explode('|', $topic);
-                if(is_array($data_arr)){
-                    
-                    // $lm_setting->lm_page_url  == same as org_url + url type 
-                     $lm_post_id = url_to_postid($lm_setting->lm_page_url.$lm_city_obj->lm_url_slug.'/'.$data_arr[0]); 
-                                         
-                    $mrylm_post = array(
-                        'ID'=>  $lm_post_id,
-                        'post_title'    => $data_arr[1],
-                        'post_name'    => $data_arr[0],
-                        'post_content'  => '',
-                        'post_status'   => 'publish',
-                        'post_type'   => 'page',
-                        'post_parent'   => $lm_parent_post_id,
-                        'post_author'   => 1,
-                        'post_category' => array()
-                      );   
-
-                   // $lm_insert_id = wp_insert_post( $mrylm_post ); 
-                    $lm_insert_id =  $lm_post_id > 0 ? wp_update_post($mrylm_post) : wp_insert_post( $mrylm_post );
-                    // to set template for the page 
-                    if ( ! add_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php', true )) { 
-                        update_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php' );
-                    }                
-                }                
-            }
-        }
-    }    
-}
-
-// OK
-function delete_lm_topic_pages($lm_topics, $lm_page_url) {
-
-    if ($lm_topics != '') {
-
-        $topic_arr = explode('=',$lm_topics);
-
-        if (is_array($topic_arr)) {
-            
-            foreach ($topic_arr AS $topic) {
-
-                $data_arr = explode('|', $topic);
-                
-                if (is_array($data_arr)) {                               
-                    $postid = url_to_postid($lm_page_url . '/'.$data_arr[0]);
-                    if ($postid) {
-                        wp_delete_post($postid, true);
-                    }
-                }
-            }
-        }
-    }
-}
-
-// OK
 function create_service_area_page($lm_setting) {
 
@@ -453 +267 @@
         'post_type' => 'page',
         'post_parent' => 0,
-        'post_author'   => 1,
         'post_category' => array()
     );

local-magic/trunk/admin/setting.php

@@ -8 +8 @@
 $mrylm_msg = "";
 
-
-function get_multi_type_formatted_data($multi_type_data = null){
-    
-    $array_data = array();
-    $text_data = json_decode($multi_type_data, true);
-    $array = explode('|', $text_data);
-    foreach($array as $value){
-
-        $arr = explode('=>', $value);
-        $array_data[$arr[0]] = $arr[1];
-    }
-    
-    return $array_data;
-}
-
 function mrylm_check_key_format($mrylm_key){
     
@@ -36 +21 @@
 }
 
+function get_multi_type_formatted_data($multi_type_data = null){
+    
+    $array_data = array();
+    $text_data = json_decode($multi_type_data, true);
+    $array = explode('|', $text_data);
+    foreach($array as $value){
+
+        $arr = explode('=>', $value);
+        $array_data[$arr[0]] = $arr[1];
+    }
+    
+    return $array_data;
+}
+
+function create_lm_pages($lm_setting, $lm_city, $lm_page_url){
+    
+    global $wpdb;
+    
+       // now we will create page for each city 
+        $lm_parent_post_id = url_to_postid($lm_page_url);  
+        $lm_post_id = url_to_postid($lm_page_url.$lm_city->lm_url_slug); 
+
+        if($lm_city->lm_parent_id > 0){                
+            $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
+            $lm_city_2 = $wpdb->get_row($lm_sql);
+            $lm_parent_post_id = url_to_postid($lm_page_url.$lm_city_2->lm_url_slug); 
+        }    
+
+        // If there are no sub page then we hv to parent post id 0
+        if ($lm_setting->lm_page_type == 'base_page') {
+            $lm_parent_post_id = 0;
+        }
+
+        $mrylm_post = array(
+          'ID'=>  $lm_post_id,
+          'post_title'    => $lm_city->lm_city,
+          'post_content'  => '',
+          'post_status'   => 'publish',
+          'post_type'   => 'page',
+          'post_parent'   => $lm_parent_post_id,
+          'post_category' => array()
+        );
+
+        //Insert the post into the database            
+        $lm_insert_id = wp_insert_post( $mrylm_post );
+
+        // to set template for the page 
+        if ( ! add_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php', true )) { 
+            update_post_meta( $lm_insert_id, '_wp_page_template', 'local-magic.php' );
+        } 
+}
+
+
 function mrylm_process_pages(){
     
@@ -45 +83 @@
     if($lm_setting->lm_url_type == 'wp_remote_get'){        
         $mrylm_response   = wp_remote_get('https://localmagic.reviewmanager.app/plugin/cities/' . $lm_setting->lm_unique_id);
-        $mrylm_cities  = json_decode($mrylm_response['body']);        
+        $mrylm_cities  = json_decode($mrylm_response['body']);
+        
     }else{                 
         $mrylm_response = file_get_contents('https://localmagic.reviewmanager.app/plugin/cities/' . $lm_setting->lm_unique_id);
@@ -51 +90 @@
     }
      
-    if(!empty($mrylm_cities)){           
+       if(!empty($mrylm_cities)){           
          
          // Trancating existing Cities table
@@ -86 +125 @@
                 'lm_historic_landmark' => $obj->historic_landmark,
                 'lm_assisted_living' => $obj->assisted_living,
-                'lm_restaurant' => $obj->restaurant,
-                'lm_topics' => $obj->topics,
-                'lm_type' => $obj->lm_type,
-                'lm_is_default' => $obj->is_default,
-                'lm_other_info' => $obj->other_info,    
-                'lm_neighbour_id' => $obj->neighbour_id 
+                'lm_restaurant' => $obj->restaurant
             );
 
@@ -99 +133 @@
             $lm_city = array();
             $lm_city['lm_parent_id'] = $obj->parent_id;
-            $lm_city['lm_type'] = $obj->lm_type;
-            $lm_city['lm_slug'] = $obj->slug;
             $lm_city['lm_url_slug'] = $obj->url_slug;
             $lm_city['lm_city'] = $obj->city;
-            $lm_city['lm_topics'] = $obj->topics;
             $lm_obj_city = (object) $lm_city; 
             
             // need to process multi type
-             if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
+             if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
 
                 $lm_multi_titles = get_multi_type_formatted_data($lm_setting->lm_multi_title);
@@ -113 +144 @@
 
                     $lm_page_url = $lm_setting->lm_org_url.$key.'/';
-                    $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                    create_lm_pages($lm_setting, $lm_obj_city, $lm_page_url);    
                 }
 
-            }else if($lm_setting->lm_types == 'type-wise'){
-                
-                if($lm_obj_city->lm_type){
-                    $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/'; 
-                    $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-                }
-                
-            }else{ // single type city
-                
-                $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);              
+            }else{
+                create_lm_pages($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
             }            
         }
@@ -140 +158 @@
     }   
 }
+
 
 if (isset($_POST['submit']) && is_user_logged_in()) {
@@ -226 +245 @@
                     'lm_multi_keyword' => $lm_setting->multi_keyword,
                     'lm_multi_head' => $lm_setting->multi_head,
-                    'lm_multi_near_me' => $lm_setting->multi_near_me,
-                    'lm_is_topic' => $lm_setting->is_topic,
-                    'lm_types' => $lm_setting->lm_types
+                    'lm_multi_near_me' => $lm_setting->multi_near_me
                 );
 

local-magic/trunk/include/function.php

@@ -9 +9 @@
 }
 
-
 function get_multi_type_data($multi_type_data = null){
     
@@ -24 +23 @@
 }
 
-
 function mrylm_get_city(){
     
     global $wpdb;
+    
+    $url  = get_permalink();
+    $arr  = explode('/', trim($url, '/'));
+    $slug = end($arr);   
+    $prev = prev($arr); 
+    
+    $full_slug = $prev.'/'.$slug;
     
     $lm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
     $lm_setting     = $wpdb->get_row($lm_setting_sql);
-    
-    $url  = get_permalink();
-    $arr  = explode('/', trim($url, '/'));
-    
-    $slug = end($arr);   
-    $prev = prev($arr); 
-    $lm_type = ''; //$arr[4]; 
-    
-    
-    // This [4] is depends on url format
-    if($lm_setting->lm_is_topic){
-        if(count($arr) > 4){ // there are topic
-            $slug = $arr[4];  
-        }    
-    }
-     
     if ($lm_setting->lm_org_url == $url) {
-        $slug = $lm_setting->lm_default_city;
+        $full_slug = $lm_setting->lm_default_city;
     }    
     
-    $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_slug = '$slug'";
-    if($lm_type){
-         $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_slug = '$slug'  AND lm_type = '$lm_type'";
+    $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_url_slug = '$full_slug'";
+    $lm_city = $wpdb->get_row($lm_sql);
+    
+    if(empty($lm_city)){
+        $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities WHERE lm_url_slug = '$slug'";
+        $lm_city = $wpdb->get_row($lm_sql);
     } 
-    $lm_city = $wpdb->get_row($lm_sql);     
     
     return $lm_city;
@@ -311 +302 @@
   
         $content = file_get_contents($lm_setting->lm_template_other_path.'/lm-'.$url_slug.'-content.php');
-    }
-    
-    
-     // Widget Part
-    if($lm_setting->lm_is_topic && $lm_city->lm_topics != ''){
-      
-        $topic_widget = '';
-        $topic_arr = json_decode($lm_city->lm_topics);
-
-        if(is_array($topic_arr)){
-            foreach($topic_arr AS $topic){
-               $data_arr = explode('|', $topic); 
-               $topic_url = $lm_setting->lm_page_url . $lm_city->lm_url_slug . '/' .$data_arr[0]; 
-               $topic_widget .= '<a class="btn lm-hero-btn" href="'.$topic_url.'"><span>'.$data_arr[1].'</span></a>';
-            }   
-        }
-        
-       if($topic_widget != ''){
-           $content = str_replace('TOPIC_WIDGET', $topic_widget, $content);
-       }else{
-           $content = str_replace('TOPIC_WIDGET', '', $content);
-       } 
-       
-    }
-    // URL CUSTOM  END
-    
-    
-    
-    // process POI  widget
-    if($lm_setting->lm_is_point_of_interest){
-        
-        
-        $poi_data = mrylm_poi($type = ''); 
-        $content = str_replace('POI_FEED', $poi_data, $content);
-        
-    }
-    
+    }   
     
     
@@ -406 +361 @@
     $reviews = mrylm_review_testimonial($lm_city); 
     $content = str_replace('REVIEW_FEED', $reviews, $content);
-        
+    
+    
+    // process POI  widget
+    if($lm_setting->lm_is_point_of_interest){
+        $poi_data = mrylm_poi($type = ''); 
+        $content = str_replace('POI_FEED', $poi_data, $content);
+    }
+    
     return $content;  
     
@@ -484 +446 @@
 
             // Set img title  and alt attributes
-            $title_text = ucwords(trim($img_keyword_arr[$counter]).' '.$city.', '.$state);
+            $title_text = ucwords($img_keyword_arr[$counter].' '.$city.', '.$state);
             $image->setAttribute('alt', $title_text);
             $image->setAttribute('title', $title_text);
@@ -700 +662 @@
         // get news data as per keyword   
         $lm_news = mrylm_get_news_list($lm_setting, $lm_city);
-        $data .= mrylm_get_list_data($lm_setting, $lm_news, $lm_city);
-       
+
+        if($lm_setting->lm_display_type == 'list'){
+            $data .= mrylm_get_list_data($lm_setting, $lm_news, $lm_city);
+        }else if($lm_setting->lm_display_type == 'accordion'){
+            $data .= mrylm_get_accordion_data($lm_setting, $lm_news, $lm_city);
+        }
 
         $style =  '<style>';
@@ -832 +798 @@
 }
    
+function mrylm_get_accordion_data($lm_setting, $lm_news, $lm_city){
+        
+    $separator  = 'in';         
+    $data = ''; 
+
+    $data .= '<div class="lm-accordion-container">';
+
+            if(isset($lm_news) && !empty($lm_news)){
+
+                $data .= '<h2 class="lm-widget-title">'.$lm_setting->lm_head_line.' '.$separator.' '. $lm_city->lm_city .', '. $lm_city->lm_state .'</h2>';
+                
+                // foreach start
+                $data .= '<div class="lm-accordion-inner">';
+
+                foreach($lm_news as $obj){
+
+                    $detail  = trim(preg_replace("/<figure[^>]*>(.+?)<\/figure>/", "", $obj->lm_news)); 
+                    $detail  = trim(preg_replace("/<iframe[^>]*>(.+?)<\/iframe>/", "", $detail)); 
+                    $detail  = trim(preg_replace("/<img[^>]*>(.+?)<\/img>/", "", $detail)); 
+                    $detail  = preg_replace('/(<a\b[^><]*)>/i', '$1 rel="nofollow;" target="_blank">',$detail);
+
+                    $active = 'none;';
+                    $active_class = '';
+
+                    if($key == 0){$active_class = 'lm-active';  $active = 'block;'; } 
+
+                   $author = $obj->lm_author ? $obj->lm_author :  $obj->lm_source;
+                   $source = $obj->lm_source ? $obj->lm_source : $lm_setting->lm_org_name;
+
+                    $data .= '<div class="lm-accordion-item" itemscope itemtype="http://schema.org/NewsArticle">';
+                        $data .= '<meta itemscope itemprop="mainEntityOfPage"  itemType="https://schema.org/WebPage" itemid="'.$obj->lm_detail_url.'"/>';
+                        $data .= '<h2 class="lm-accordion-title '.$active_class.'"  itemprop="headline">'.$obj->lm_title.'</h2>';
+                        $data .= '<h3 style="display:none;" itemprop="author" itemscope itemtype="https://schema.org/Person">';
+                            $data .= '<span itemprop="name">'.$author.'</span>';
+                            $data .= '<span itemprop="url">'.$obj->lm_detail_url.'</span>';
+                        $data .= '</h3>';
+                        $data .= '<div class="lm-accordion-content" style="display:'.$active.'">';
+                            $data .= '<div class="lm-read-less"><p>'. strip_tags(substr($detail, 0, 550)). '...</p></div>';                               
+                            $data .= '<div class="lm-read-more" itemprop="description">'. $detail. '</div>';  
+                            $data .= '<button class="lm-btn">Read more</button>';
+                        $data .= '</div>';
+
+                        $data .= '<div itemprop="image" itemscope itemtype="https://schema.org/ImageObject">   
+                                        <meta itemprop="url" content="'.$lm_setting->lm_org_logo_url.'">   
+                                      </div>';
+                        $data .= '<div itemprop="publisher" itemscope itemtype="https://schema.org/Organization">
+                                    <div itemprop="logo" itemscope itemtype="https://schema.org/ImageObject">      
+                                      <meta itemprop="url" content="'.$lm_setting->lm_org_logo_url.'">      
+                                    </div>
+                                    <meta itemprop="name" content="'.$source.'">
+                                  </div>';
+                        $data .= '<meta itemprop="datePublished" content="'.date('Y-m-d H:i:s', strtotime($obj->lm_created_at)).'"/>';
+                        $data .= '<meta itemprop="dateModified" content="'.date('Y-m-d H:i:s', strtotime($obj->lm_updated_at)).'"/>';
+
+                    $data .= '</div>';
+                }
+
+                $data .= '</div>';
+
+            }else{
+                $data .= ''; '<div class="news-block">No news data found.</div>';
+            }        
+
+    $data .= '</div>';
+
+    return $data;
+    
+}
+    
 function mrylm_review_testimonial($lm_city = null){      
     
@@ -1405 +1440 @@
 
 /* Job End */
+
 
 /* POI Start */

local-magic/trunk/local-magic.php

@@ -12 +12 @@
  * Plugin Name:       Local Magic
  * Plugin URI:        https://www.mrmarketingres.com/local-magic
- * Description:       The Local Magic© WordPress plugin extends the functionality of the SaaS Local Magic© to WordPress so that the local news feed can be displayed on the WordPress website. The plugin is for customers of Local Magic© that have an active subscription with the company.
+ * Description:       The Local Magic® WordPress plugin extends the functionality of the SaaS Local Magic® to WordPress so that the local news feed can be displayed on the WordPress website. The plugin is for customers of Local Magic® that have an active subscription with the company.
  * Version:           2.5.0
  * Requires at least: 3.5.1
- * Tested up to:      6.3.0
+ * Tested up to:      6.7.1
  * Requires PHP:      5.6.0
  * Author:            matthewrubin
@@ -27 +27 @@
     exit; // Exit if accessed directly
 
-
-define('MRYLM_VERSION', '2.4.0');
+define('MRYLM_VERSION', '2.5.0');
 
 define('MRYLM_PLUGIN_DIR', plugin_dir_path(__FILE__));
@@ -51 +50 @@
 /* ACTION START */
 
-function mrylm_enqueue_scripts() {  
-    
-   // wp_enqueue_style('owl.carousel.min.css', plugin_dir_url(__FILE__) . 'assets/css/owl.carousel.min.css', array(), '0.1.0', 'all');
-   // wp_register_script('owl.carousel.min.js', plugin_dir_url(__FILE__) . 'assets/js/owl.carousel.min.js', '', FALSE, TRUE);
-   // wp_enqueue_script('owl.carousel.min.js');    
+function mrylm_enqueue_scripts() {   
 }
 add_action('wp_enqueue_scripts', 'mrylm_enqueue_scripts');
-
 
 function mrylm_admin_menu() {
@@ -67 +61 @@
 add_action('admin_menu', 'mrylm_admin_menu');
 
-
 function mrylm_options() {
 
@@ -79 +72 @@
 
 /* UPDATE ACTION START */
+add_action( 'upgrader_process_complete', 'mrylm_upgrade_function',10, 2);
 function mrylm_upgrade_function( $upgrader_object, $options ) {
     
-   // require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-   // mrylm_update_tables();
-}
-add_action( 'upgrader_process_complete', 'mrylm_upgrade_function',10, 2);
+    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
+    mrylm_update_tables();
+}
 /* UPDATE ACTION END */
 
@@ -94 +87 @@
 add_shortcode('mrylm-article', 'mrylm_article_shortcode');
 
-
 function mrylm_dropdown_menu_shortcode($attr, $content) {
     return mrylm_dropdown_menu($content);
@@ -127 +119 @@
 /* SHORT CODE END */
 
-
 // DESTROY LM
-/* Manage/ Destroy Page data Start  Done*/
+/* Manage/ Destroy Page data Start */
 add_action('wp_ajax_nopriv_mrylm-manage-pages', 'mrylm_manage_pages');
-
 function mrylm_manage_pages() {
 
     global $wpdb;
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();
     
     $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
@@ -146 +134 @@
     if (isset($lm_cities) && $lm_cities != '') {
         
-        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
-            
+        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
             $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
             foreach($lm_multi_titles AS $key=>$lm_title){
@@ -153 +140 @@
                     $postid = url_to_postid($lm_setting->lm_org_url. $key.'/'. $obj->lm_url_slug);
                     if ($postid) {
-                        $parent_url = $lm_setting->lm_org_url. $key.'/'. $obj->lm_url_slug;
-                        delete_lm_topic_pages($obj->lm_topics, $parent_url);
                         wp_delete_post($postid, true);
                     }
@@ -160 +145 @@
             }
             
-        }else if($lm_setting->lm_types == 'type-wise'){
-            
-            foreach ($lm_cities as $obj) {
-                $lm_page_url = $lm_setting->lm_org_url.$obj->lm_type.'/'.$obj->lm_url_slug;                  
-                $postid = url_to_postid($lm_page_url);
-                if ($postid) {
-                    delete_lm_topic_pages($obj->lm_topics, $lm_page_url);
-                    wp_delete_post($postid, true);
-                } 
-            } 
-            
         }else{
             foreach ($lm_cities as $obj) {
                 $postid = url_to_postid($lm_setting->lm_page_url . $obj->lm_url_slug);
                 if ($postid) {
-                    $parent_url = $lm_setting->lm_page_url . $obj->lm_url_slug;
-                    delete_lm_topic_pages($obj->lm_topics, $parent_url);
-                    wp_delete_post($postid, true);                    
+                    wp_delete_post($postid, true);
                 }
             }
@@ -209 +181 @@
 
 
-/* Update Setting data Start Done */
+/* Update Setting data Start */
 add_action('wp_ajax_nopriv_mrylm-update-setting', 'mrylm_update_setting');
 
@@ -275 +247 @@
             'lm_multi_keyword' => $lm_setting->multi_keyword,
             'lm_multi_head' => $lm_setting->multi_head,
-            'lm_multi_near_me' => $lm_setting->multi_near_me,
-            'lm_is_topic' => $lm_setting->is_topic,
-            'lm_types' => $lm_setting->lm_types
+            'lm_multi_near_me' => $lm_setting->multi_near_me
         );
 
@@ -290 +260 @@
 
 
-/* Manage Cities data Start Pore Hobe */
+/* Manage Cities data Start */
 add_action('wp_ajax_nopriv_mrylm-manage-cities', 'mrylm_manage_cities');
 function mrylm_manage_cities() {
-    
+
+    // functional code will go here    
+    $lm_cities = $_POST['cities'];
     require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
     mrylm_update_tables();
-    $lm_cities = $_POST['cities'];
      
     if (isset($lm_cities)) {
@@ -338 +309 @@
                 'lm_historic_landmark' => $obj->historic_landmark,
                 'lm_assisted_living' => $obj->assisted_living,
-                'lm_restaurant' => $obj->restaurant,
-                'lm_topics' => $obj->topics,
-                'lm_type' => $obj->lm_type,
-                'lm_is_default' => $obj->is_default,
-                'lm_other_info' => $obj->other_info,    
-                'lm_neighbour_id' => $obj->neighbour_id 
+                'lm_restaurant' => $obj->restaurant
             );
 
@@ -351 +317 @@
             $lm_city = array();
             $lm_city['lm_parent_id'] = $obj->parent_id;
-            $lm_city['lm_type'] = $obj->lm_type;
-            $lm_city['lm_slug'] = $obj->slug;
             $lm_city['lm_url_slug'] = $obj->url_slug;
             $lm_city['lm_city'] = $obj->city;
-            $lm_city['lm_topics'] = $obj->topics;
             $lm_obj_city = (object) $lm_city; 
 
-            if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
+            if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
 
                 $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
@@ -364 +327 @@
 
                     $lm_page_url = $lm_setting->lm_org_url.$key.'/';
-                    $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                    create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);    
                 }
 
-            }else if($lm_setting->lm_types == 'type-wise'){
-                if($lm_obj_city->lm_type){              
-                    $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/'; 
-                    $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-                }
-                
-            }else{                
-                
-                $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+            }else{
+                create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
             }
-        }        
+
+        }
+        
     }
     
@@ -396 +349 @@
 
 
-/* Manage Typewise city Start */
-add_action('wp_ajax_nopriv_mrylm-manage-typewise-cities', 'mrylm_manage_typewise_cities');
-function mrylm_manage_typewise_cities() {
-    
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();
+/* Add single type cities data Start */
+add_action('wp_ajax_nopriv_mrylm-manage-single-types', 'mrylm_manage_single_types');
+function mrylm_manage_single_types() {
+
+    // functional code will go here    
     $lm_cities = $_POST['cities'];
-    $lm_type = $_POST['lm_type'];
-        
+    $lm_url_type = $_POST['lm_type'];
+     
+
     if (isset($lm_cities)) {
 
@@ -411 +364 @@
         $lm_cities = json_decode($lm_cities);
         
-        $lm_del_sql = "DELETE FROM {$wpdb->prefix}mrylm_cities WHERE lm_type = '$lm_type'";
-        $wpdb->query($lm_del_sql);
-
         $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
         $lm_setting = $wpdb->get_row($mrylm_setting_sql);
-                
-        foreach ($lm_cities as $obj) {
-
-            $city = stripslashes($obj->city);
-            $data_arr = array(
-                'lm_city_id' => $obj->id,
-                'lm_parent_id' => $obj->parent_id,
-                'lm_city' => $city,
-                'lm_state' => $obj->state,
-                'lm_slug' => $obj->slug,
-                'lm_url_slug' => $obj->url_slug,
-                'lm_google_map_id' => $obj->google_map_id,
-                'lm_form_id' => $obj->form_id,
-                'lm_city_keyword_separator' => $obj->city_keyword_separator,
-                'lm_location' => $obj->location,
-                'lm_city_phone' => $obj->city_phone,
-                'lm_city_mayor' => $obj->city_mayor,
-                'lm_population' => $obj->population,
-                'lm_avg_home_value' => $obj->avg_home_value,
-                'lm_avg_household_income' => $obj->avg_household_income,
-                'lm_avg_temperature' => $obj->avg_temperature,
-                'lm_price_range' => $obj->price_range,
-                'lm_image' => $obj->image,
-                'lm_description' => $obj->description,
-                'lm_telephone' => $obj->telephone,
-                'lm_educational_institution' => $obj->educational_institution,
-                'lm_state_park' => $obj->state_park,
-                'lm_historic_landmark' => $obj->historic_landmark,
-                'lm_assisted_living' => $obj->assisted_living,
-                'lm_restaurant' => $obj->restaurant,
-                'lm_topics' => $obj->topics,
-                'lm_type' => $obj->lm_type,
-                'lm_is_default' => $obj->is_default,
-                'lm_other_info' => $obj->other_info,
-                'lm_neighbour_id' => $obj->neighbour_id
-            );
-
-            $mrylm_table_name = $wpdb->prefix . "mrylm_cities";
-            $wpdb->insert($mrylm_table_name, $data_arr);
-
-            $lm_city = array();
-            $lm_city['lm_parent_id'] = $obj->parent_id;
-            $lm_city['lm_type'] = $obj->lm_type;
-            $lm_city['lm_slug'] = $obj->slug;
-            $lm_city['lm_url_slug'] = $obj->url_slug;
-            $lm_city['lm_city'] = $obj->city;
-            $lm_city['lm_topics'] = $obj->topics;
-            $lm_obj_city = (object) $lm_city; 
-                 
-            
-            $lm_page_url = $lm_setting->lm_org_url.$lm_type.'/';
-            $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-            
-            $lm_setting->lm_page_url = $lm_page_url;
-            // need to delete old/existing topic pages before create Topic page
-            create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-            
-        }        
-    }
-    
-    // for service area page page
-    if($lm_setting->lm_is_service_area_page){        
-        create_service_area_page($lm_setting);
-    } 
-    
-    echo TRUE;
-}
-
-/* Manage Typewise city Start End */
-
-
-/* Add single type cities data Start */
-add_action('wp_ajax_nopriv_mrylm-manage-single-types', 'mrylm_manage_single_types');
-function mrylm_manage_single_types() {
-
-    // functional code will go here    
-    $lm_cities = $_POST['cities'];
-    $lm_url_type = $_POST['lm_type'];     
-
-    if (isset($lm_cities)) {
-
-        global $wpdb;
+        
+        // we can create parent page , LM type page
         require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
         mrylm_update_tables();
-        
-        $lm_cities = stripcslashes(str_replace('\"', '"', $lm_cities));
-        $lm_cities = json_decode($lm_cities);
-        
-        $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
-        $lm_setting = $wpdb->get_row($mrylm_setting_sql);
-                    
+        $lm_page_url = $lm_setting->lm_org_url.$lm_url_type.'/';
+         
         foreach ($lm_cities as $obj) {
             
@@ -512 +377 @@
             $city = array();
             $city['lm_parent_id'] = $obj->parent_id;
-            $city['lm_type'] = $obj->lm_type;
-            $city['lm_slug'] = $obj->slug;
             $city['lm_url_slug'] = $obj->url_slug;
             $city['lm_city'] = $city_name;
-            $city['lm_topics'] = $obj->topics;;
             $lm_city = (object) $city; 
 
             if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
                
-                $lm_page_url = $lm_setting->lm_org_url.$lm_url_type.'/';
-                $insert_id = create_lm_page($lm_setting, $lm_city, $lm_page_url);
-                $lm_setting->lm_page_url = $lm_page_url;
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_city);
+                create_lm_page($lm_setting, $lm_city, $lm_page_url);
             }
         }        
@@ -534 +393 @@
 
 
-/* Add City data Start Done */
+/* Add City data Start*/
 add_action('wp_ajax_nopriv_mrylm-add-city', 'mrylm_add_city');
 function mrylm_add_city() {
 
     $lm_city = $_POST['city'];
-    
-    // we can create parent page , LM type page
-    global $wpdb;
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();
-   
+    mrylm_upgrade_function(array(), array());
     
     if (isset($lm_city)) {
@@ -550 +404 @@
         $lm_city = json_decode($lm_city);
 
+        global $wpdb;
 
         $mrylm_setting_sql = "SELECT * FROM {$wpdb->prefix}mrylm_setting";
@@ -581 +436 @@
             'lm_historic_landmark' => $lm_city->historic_landmark,
             'lm_assisted_living' => $lm_city->assisted_living,
-            'lm_restaurant' => $lm_city->restaurant,
-            'lm_topics' => $lm_city->topics,
-            'lm_type' => $lm_city->lm_type,
-            'lm_is_default' => $lm_city->is_default,
-            'lm_other_info' => $lm_city->other_info,
-            'lm_neighbour_id' => $lm_city->neighbour_id
+            'lm_restaurant' => $lm_city->restaurant
         );
         $mrylm_table_name = $wpdb->prefix . "mrylm_cities";
@@ -594 +444 @@
         $obj = array();
         $obj['lm_parent_id'] = $lm_city->parent_id;
-        $obj['lm_slug'] = $lm_city->slug;
         $obj['lm_url_slug'] = $lm_city->url_slug;
         $obj['lm_city'] = $lm_city->city;
-        $obj['lm_type'] = $lm_city->lm_type;
-        $obj['lm_topics'] = $lm_city->topics;
-        $lm_obj_city = (object) $obj;
-              
+        $lm_obj_city = (object) $obj; 
+        
         // now process multi page         
-        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''  && $lm_setting->lm_types == 'multi-type'){
+        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
 
             $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
-           
             foreach($lm_multi_titles AS $key=>$lm_title){
 
                 $lm_page_url = $lm_setting->lm_org_url.$key.'/';
-               
-                $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url); 
-                $lm_setting->lm_page_url = $lm_page_url;
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);    
             }
 
-        }else if($lm_setting->lm_types == 'type-wise'){
-              
-            
-            if($lm_obj_city->lm_type){
-                $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/'; 
-                $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url);
-                $lm_setting->lm_page_url = $lm_page_url;
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-            }
-            
-                    
         }else{
-            $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
-            create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);            
+            create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url);
         } 
     }
@@ -634 +465 @@
 /* Add City data End*/
 
-
-/* Update City data Start Done*/
+function create_lm_page($lm_setting, $lm_city, $lm_page_url){
+    
+     global $wpdb;
+     
+    // now we will create page for each city 
+    $lm_parent_post_id = url_to_postid($lm_page_url);                
+    $lm_post_id  = url_to_postid($lm_page_url . $lm_city->lm_url_slug);
+
+    if ($lm_city->lm_parent_id > 0) {
+        $lm_sql = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
+        $lm_city_2 = $wpdb->get_row($lm_sql);
+        $lm_parent_post_id = url_to_postid($lm_page_url. $lm_city_2->lm_url_slug);
+    }
+
+    // If there are no sub page then we hv to parent post id 0
+    if ($lm_setting->lm_page_type == 'base_page') {
+        $lm_parent_post_id = 0;
+    }
+
+    $mrylm_post = array(
+        'ID' => $lm_post_id,
+        'post_title' => $lm_city->lm_city,
+        'post_content' => '',
+        'post_status' => 'publish',
+        'post_type' => 'page',
+        'post_parent' => $lm_parent_post_id,
+        'post_category' => array()
+    );
+
+    //Insert the post into the database            
+    $lm_insert_id = wp_insert_post($mrylm_post);
+
+    // to set template for the page 
+    if (!add_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php', true)) {
+        update_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php');
+    }
+}
+
+/* Update City data Start*/
 add_action('wp_ajax_nopriv_mrylm-update-city', 'mrylm_update_city');
 function mrylm_update_city() {
 
     $lm_city = $_POST['city'];
-    
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
-    mrylm_update_tables();   
+    mrylm_upgrade_function(array(), array());
     
     if (isset($lm_city)) {
@@ -659 +525 @@
         
         // Update city data        
-        $city = stripslashes($lm_city->city);       
-               
-        $wpdb->update( 
-            $wpdb->prefix.'mrylm_cities', 
-            array( 
-                'lm_parent_id' => $lm_city->parent_id, 
-                'lm_city' => $city, 
-                'lm_state' => $lm_city->state,
-                'lm_slug' => $lm_city->slug,
-                'lm_url_slug' => $lm_city->url_slug,
-                'lm_google_map_id' => $lm_city->google_map_id,
-                'lm_form_id' => $lm_city->form_id,
-                'lm_city_keyword_separator' => $lm_city->city_keyword_separator,
-                'lm_location' => $lm_city->location,
-                'lm_city_phone' => $lm_city->city_phone,    
-                'lm_city_mayor' => $lm_city->city_mayor,    
-                'lm_population' => $lm_city->population,    
-                'lm_avg_home_value' => $lm_city->avg_home_value,    
-                'lm_avg_household_income' => $lm_city->avg_household_income,    
-                'lm_avg_temperature' => $lm_city->avg_temperature,    
-                'lm_price_range' => $lm_city->price_range,    
-                'lm_image' =>  $lm_city->image,    
-                'lm_description' => $lm_city->description,    
-                'lm_telephone' => $lm_city->telephone,    
-                'lm_educational_institution' =>  $lm_city->educational_institution,    
-                'lm_state_park' => $lm_city->state_park,    
-                'lm_historic_landmark' => $lm_city->historic_landmark,   
-                'lm_assisted_living' => $lm_city->assisted_living,  
-                'lm_restaurant' => $lm_city->restaurant,   
-                'lm_topics' => $lm_city->topics,  
-                'lm_type' => $lm_city->lm_type,
-                'lm_is_default' => $lm_city->is_default,
-                'lm_other_info' => $lm_city->other_info,
-                'lm_neighbour_id' => $lm_city->neighbour_id
-            ), 
-            array( 'lm_city_id' => $lm_city->id )
-        );
-       
-        $obj = array();      
+        $city = stripslashes($lm_city->city);        
+        $data_arr = "UPDATE {$wpdb->prefix}mrylm_cities
+                        SET lm_parent_id = '" . $lm_city->parent_id . "', 
+                        lm_city = '" . $city . "', 
+                        lm_state = '" . $lm_city->state . "',
+                        lm_slug = '" . $lm_city->slug . "',
+                        lm_url_slug = '" . $lm_city->url_slug . "',
+                        lm_google_map_id = '" . $lm_city->google_map_id . "',
+                        lm_form_id = '" . $lm_city->form_id . "',
+                        lm_city_keyword_separator = '" . $lm_city->city_keyword_separator . "',
+                        lm_location = '" . $lm_city->location . "',
+                        lm_city_phone = '" . $lm_city->city_phone . "',    
+                        lm_city_mayor = '" . $lm_city->city_mayor . "',    
+                        lm_population = '" . $lm_city->population . "',    
+                        lm_avg_home_value = '" . $lm_city->avg_home_value . "',    
+                        lm_avg_household_income = '" . $lm_city->avg_household_income . "',    
+                        lm_avg_temperature = '" . $lm_city->avg_temperature . "',    
+                        lm_price_range = '" . $lm_city->price_range . "',    
+                        lm_image = '" . $lm_city->image . "',    
+                        lm_description = '" . $lm_city->description . "',    
+                        lm_telephone = '" . $lm_city->telephone . "',    
+                        lm_educational_institution = '" . $lm_city->educational_institution . "',    
+                        lm_state_park = '" . $lm_city->state_park . "',    
+                        lm_historic_landmark = '" . $lm_city->historic_landmark . "',   
+                        lm_assisted_living = '" . $lm_city->assisted_living . "' ,  
+                        lm_restaurant = '" . $lm_city->restaurant . "'   
+                    WHERE lm_city_id = " . $lm_city->id . "";
+
+        $wpdb->query($data_arr);
+         
+        $obj = array();
         $obj['lm_parent_id'] = $lm_city->parent_id;
-        $obj['lm_slug'] = $lm_city->slug;
         $obj['lm_url_slug'] = $lm_city->url_slug;
         $obj['lm_city'] = $lm_city->city;
-        $obj['lm_type'] = $lm_city->lm_type;
-        $obj['lm_topics'] = $lm_city->topics;
         $lm_obj_city = (object) $obj; 
-         
-        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''  && $lm_setting->lm_types == 'multi-type'){
+        
+        if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
                     
             $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
@@ -713 +568 @@
                 $lm_page_url = $lm_setting->lm_org_url.$key.'/';             
                 $lm_post_id = url_to_postid($lm_page_url . $lm_city_old->lm_url_slug);                
-                $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_page_url, $lm_post_id);  
-                create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
+                update_lm_page($lm_setting, $lm_obj_city, $lm_page_url, $lm_post_id);    
             }
-            
-        }else if($lm_setting->lm_types == 'type-wise'){
-                
-                if($lm_obj_city->lm_type){
-                    $lm_page_url = $lm_setting->lm_org_url.$lm_obj_city->lm_type.'/';                  
-                    $lm_post_id = url_to_postid($lm_page_url . $lm_city_old->lm_url_slug);                 
-                    $insert_id =  create_lm_page($lm_setting, $lm_obj_city, $lm_page_url, $lm_post_id);
-                    $lm_setting->lm_page_url = $lm_page_url;
-                    create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-                }
 
         }else{            
             
             $lm_post_id = url_to_postid($lm_setting->lm_page_url . $lm_city_old->lm_url_slug);            
-            $insert_id = create_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url, $lm_post_id);
-            create_lm_topic_pages($insert_id, $lm_setting, $lm_obj_city);
-        }        
+            update_lm_page($lm_setting, $lm_obj_city, $lm_setting->lm_page_url, $lm_post_id);
+        }
+                
+        // now we will create page for city 
+        
     }
 }
 /* Update City data End */
 
-/* Manage News data Start  */
+function update_lm_page($lm_setting, $lm_city, $lm_page_url, $lm_post_id){
+    
+    global $wpdb;    
+    
+    $lm_parent_post_id = url_to_postid($lm_page_url);  
+       
+    if($lm_city->lm_parent_id > 0){                
+        $lm_sql_2 = "SELECT * FROM {$wpdb->prefix}mrylm_cities  WHERE lm_city_id = '$lm_city->lm_parent_id'";
+        $lm_city_2 = $wpdb->get_row($lm_sql_2);
+        $lm_parent_post_id = url_to_postid($lm_page_url.$lm_city_2->lm_url_slug); 
+    }  
+
+    // If there are no sub page then we hv to parent post id 0
+    if ($lm_setting->lm_page_type == 'base_page') {
+        $lm_parent_post_id = 0;
+    }
+
+    $mrylm_post = array(
+        'ID' => $lm_post_id,
+        'post_title' => $lm_city->lm_city,
+        'post_name' => $lm_city->lm_url_slug,
+        'post_content' => '',
+        'post_status' => 'publish',
+        'post_type' => 'page',
+        'post_parent' => $lm_parent_post_id,
+        'post_category' => array()
+    );
+    
+    //Insert the post into the database            
+    $lm_insert_id = wp_update_post($mrylm_post);
+
+    // to set template for the page 
+    if (!add_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php', true)) {
+        update_post_meta($lm_insert_id, '_wp_page_template', 'local-magic.php');
+    }        
+}
+
+
+/* Manage News data Start */
 add_action('wp_ajax_nopriv_mrylm-manage-news', 'mrylm_manage_news');
 function mrylm_manage_news() {
@@ -787 +671 @@
     }
 
-    echo TRUE;    
+    echo TRUE;
+    
 }
 /* Manage News data End */
 
 
-/* Delete a City Start Done */
+/* Delete a City Start */
 add_action('wp_ajax_nopriv_mrylm-delete-city', 'mrylm_delete_city');
 function mrylm_delete_city() {
 
     global $wpdb;
-    
-    require_once(MRYLM_PLUGIN_DIR . 'activate.php' );
     $lm_city_id = $_POST['city_id'];
 
@@ -813 +696 @@
     $wpdb->query($lm_del_news_sql);
     
-    if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != '' && $lm_setting->lm_types == 'multi-type'){
+    if($lm_setting->lm_is_multi_type && $lm_setting->lm_multi_title != ''){
                 
         $lm_multi_titles = get_multi_type_data($lm_setting->lm_multi_title);
@@ -819 +702 @@
            $postid = url_to_postid($lm_setting->lm_org_url. $key.'/'. $lm_city->lm_url_slug);
             if ($postid) {
-                $parent_url = $lm_setting->lm_org_url. $key.'/'. $lm_city->lm_url_slug;
-                delete_lm_topic_pages($lm_city->lm_topics, $parent_url);
-                wp_delete_post($postid, true); 
+                wp_delete_post($postid, true);                
             }
-        }        
-        
-    }else if($lm_setting->lm_types == 'type-wise'){ 
-        
-        if($lm_city->lm_type){
-            
-            $lm_page_url = $lm_setting->lm_org_url.$lm_city->lm_type.'/'.$lm_city->lm_url_slug;                  
-            $postid = url_to_postid($lm_page_url);
-            if ($postid) {
-                delete_lm_topic_pages($lm_city->lm_topics, $lm_page_url);
-                wp_delete_post($postid, true);
-            } 
         }
         
@@ -841 +710 @@
         $postid = url_to_postid($lm_setting->lm_page_url . $lm_city->lm_url_slug);
         if ($postid) {
-            $parent_url = $lm_setting->lm_page_url . $lm_city->lm_url_slug;
-            delete_lm_topic_pages($lm_city->lm_topics, $parent_url);
-            wp_delete_post($postid, true);
+            wp_delete_post($postid, true);           
         }        
     }

local-magic/trunk/readme.txt

@@ -9 +9 @@
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-The Local Magic© WordPress plugin extends the functionality of the SaaS Local Magic© to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic© that have an active subscription with the company.
+The Local Magic® WordPress plugin extends the functionality of the SaaS Local Magic® to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic® that have an active subscription with the company.
 
 == Description ==
 
-The Local Magic© WordPress plugin extends the functionality of the SaaS Local Magic© to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic© that have an active subscription with the company.
+The Local Magic® WordPress plugin extends the functionality of the SaaS Local Magic® to WordPress so that the local magic can be displayed on the WordPress website. The plugin is for customers of Local Magic® that have an active subscription with the company.
 
  
@@ -103 +103 @@
 =2.3.0= 
 1. Bug fixing and Some minor functionality added
-=2.4.0= 
-1. Topic feature added
-=2.5.0= 
-1. Re-arrange functionality