diff --git a/e107_plugins/download/e_gsitemap.php b/e107_plugins/download/e_gsitemap.php index ea3a3ef10..becffffa6 100644 --- a/e107_plugins/download/e_gsitemap.php +++ b/e107_plugins/download/e_gsitemap.php @@ -35,7 +35,8 @@ class download_gsitemap 'table' => 'download_category', 'name' => $row['download_category_name'], 'url' => e107::url('download', 'category', $row, array('mode' => 'full' )), - 'type' => LAN_PLUGIN_DOWNLOAD_NAME + 'type' => LAN_PLUGIN_DOWNLOAD_NAME, + 'class' => 0 ); } @@ -47,7 +48,8 @@ class download_gsitemap 'table' => 'download', 'name' => $row['download_name'], 'url' => e107::url('download', 'item', $row, array('mode' => 'full' )), - 'type' => LAN_PLUGIN_DOWNLOAD_NAME + 'type' => LAN_PLUGIN_DOWNLOAD_NAME, + 'class' => 0 ); } diff --git a/e107_plugins/forum/e_gsitemap.php b/e107_plugins/forum/e_gsitemap.php index b5b9c0b6e..244b27c75 100644 --- a/e107_plugins/forum/e_gsitemap.php +++ b/e107_plugins/forum/e_gsitemap.php @@ -30,7 +30,8 @@ class forum_gsitemap // plugin-folder + '_rss' 'table' => 'forum', 'name' => $row['forum_name'], 'url' => e107::url('forum','forum',$row, array('mode'=>'full')), // ('forum/forum/view', $row['forum_id']), - 'type' => LAN_PLUGIN_FORUM_NAME + 'type' => LAN_PLUGIN_FORUM_NAME, + 'class' => (int) $row['forum_class'] ); } diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php index 58767405e..1f499e404 100644 --- a/e107_plugins/gsitemap/admin_config.php +++ b/e107_plugins/gsitemap/admin_config.php @@ -224,12 +224,13 @@ class gsitemap_ui extends e_admin_ui 'id' => $row['link_id'], 'name' => $row['link_name'], 'url' => !empty($row['link_owner']) && !empty($row['link_sefurl']) ? e107::url($row['link_owner'], $row['link_sefurl']) : $row['link_url'], - 'type' => GSLAN_1); + 'type' => GSLAN_1, + 'class' => (int) $row['link_class']); } } /* custom pages ... */ - $query = "SELECT p.page_id, p.page_title, p.page_sef, p.page_chapter, ch.chapter_sef as chapter_sef, b.chapter_sef as book_sef FROM #page as p + $query = "SELECT p.page_id, p.page_title, p.page_sef, p.page_class, p.page_chapter, ch.chapter_sef as chapter_sef, b.chapter_sef as book_sef FROM #page as p LEFT JOIN #page_chapters as ch ON p.page_chapter = ch.chapter_id LEFT JOIN #page_chapters as b ON ch.chapter_parent = b.chapter_id WHERE page_title !='' ORDER BY page_datestamp ASC"; @@ -247,7 +248,8 @@ class gsitemap_ui extends e_admin_ui 'id' => $row['page_id'], 'name' => $row['page_title'], 'url' => e107::getUrl()->create($route, $row, array('full'=>1, 'allow' => 'page_sef,page_title,page_id, chapter_sef, book_sef')), - 'type' => "Page" + 'type' => "Page", + 'class' => $row['page_class'] ); } } @@ -279,8 +281,9 @@ class gsitemap_ui extends e_admin_ui - - + + + @@ -288,15 +291,29 @@ class gsitemap_ui extends e_admin_ui ".LAN_TYPE." ".LAN_NAME." ".LAN_URL." + ".defset('GSLAN_50', 'Publicly visible')." "; + $uc = e107::getUserClass(); + foreach($importArray as $k=>$ia) { $id = 'gs-'.$k; + + $class = ''; + $classLabel = ADMIN_FALSE_ICON; + + if(isset($ia['class']) && ((int) $ia['class'] === e_UC_PUBLIC)) + { + $class = 'label-success'; + $classLabel = ADMIN_TRUE_ICON; + } + + $text .= " ".str_replace(SITEURL,"",$ia['url'])." + ". $classLabel." "; } diff --git a/e107_plugins/gsitemap/languages/English_admin.php b/e107_plugins/gsitemap/languages/English_admin.php index 776e19b7d..b7ff1b997 100644 --- a/e107_plugins/gsitemap/languages/English_admin.php +++ b/e107_plugins/gsitemap/languages/English_admin.php @@ -62,4 +62,6 @@ define("GSLAN_39", "No links in sitemap - import sitelinks?"); // define('GSLAN_41', "Google Sitemap. For more information on the Sitemap protocol, go to http://www.sitemaps.org/ or Google's page About Sitemaps"); //define('GSLAN_42', 'Installation Successful..'); +define("GSLAN_50", "Publicly visible"); + diff --git a/e107_plugins/news/e_gsitemap.php b/e107_plugins/news/e_gsitemap.php index ddd33e4a5..859df82ef 100644 --- a/e107_plugins/news/e_gsitemap.php +++ b/e107_plugins/news/e_gsitemap.php @@ -36,7 +36,8 @@ class news_gsitemap 'table' => 'news_category', 'name' => $row['category_name'], 'url' => $this->url('news_category', $row), // e107::getUrl()->create('news/list/category', $row, array('full' => 1)) , - 'type' => LAN_NEWS_23 + 'type' => LAN_NEWS_23, + 'class'=> 0 ); } @@ -57,7 +58,8 @@ class news_gsitemap 'table' => 'news', 'name' => $row['news_title'], 'url' => $this->url('news', $row), - 'type' => ADLAN_0 + 'type' => ADLAN_0, + 'class' => (int) $row['news_class'], ); }