diff --git a/e107_admin/fileinspector.php b/e107_admin/fileinspector.php old mode 100644 new mode 100755 index f2866719d..23bb95988 --- a/e107_admin/fileinspector.php +++ b/e107_admin/fileinspector.php @@ -569,7 +569,7 @@ class file_inspector { // $dir // &$tree_end // &$parent_expand - function inspect($list, $deprecated, $level, $dir, &$tree_end, &$parent_expand) + function inspect($list, $deprecated, $level, $dir, &$tree_end = null, &$parent_expand = null) { global $coredir; @@ -1707,4 +1707,4 @@ i.fa-folder-open-o, i.fa-times-circle-o { cursor:pointer } return $text; } -?> \ No newline at end of file +?> diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php index 6a6a669c0..5ae2c6049 100644 --- a/e107_handlers/bbcode_handler.php +++ b/e107_handlers/bbcode_handler.php @@ -716,7 +716,7 @@ class e_bbcode $cls = array(); foreach($tmp as $v) { - if($v === 'img-rounded' || $v === 'rounded' || $v === 'bbcode' || $v === 'bbcode-img-news' || $v === 'bbcode-img') + if($v === 'img-rounded' || $v === 'rounded' || strpos($v,'bbcode') === 0 ) { continue; } diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php old mode 100644 new mode 100755 index a90a8cb3a..6418be6bc --- a/e107_handlers/db_verify_class.php +++ b/e107_handlers/db_verify_class.php @@ -147,11 +147,11 @@ class db_verify $expected['default'] = $actual['default']; } - // Loosely typed default value for int-like types - if(1 === preg_match('/[A-Z]*INT/i', $expected['type'])) + // Loosely typed default value for numeric types + if(1 === preg_match('/([A-Z]*INT|NUMERIC|DEC|FIXED|FLOAT|REAL|DOUBLE)/i', $expected['type'])) { - $expected['default'] = preg_replace("/DEFAULT '(\d+)'/i", 'DEFAULT $1', $expected['default']); - $actual['default'] = preg_replace("/DEFAULT '(\d+)'/i", 'DEFAULT $1', $actual['default'] ); + $expected['default'] = preg_replace("/DEFAULT '(\d*\.?\d*)'/i", 'DEFAULT $1', $expected['default']); + $actual['default'] = preg_replace("/DEFAULT '(\d*\.?\d*)'/i", 'DEFAULT $1', $actual['default'] ); } return array_diff_assoc($expected, $actual); diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 37849500e..4af32abcc 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -75,6 +75,7 @@ class e_plugin 'e_upload', 'e_user', 'e_library', // For third-party libraries are defined by plugins/themes. + 'e_gsitemap', ); @@ -1067,6 +1068,7 @@ class e107plugin 'e_upload', 'e_user', 'e_library', // For third-party libraries are defined by plugins/themes. + 'e_gsitemap', ); diff --git a/e107_plugins/forum/e_gsitemap.php b/e107_plugins/forum/e_gsitemap.php new file mode 100644 index 000000000..b82612b63 --- /dev/null +++ b/e107_plugins/forum/e_gsitemap.php @@ -0,0 +1,41 @@ +retrieve("forum", "*", "forum_parent!='0' ORDER BY forum_order ASC", true); + + foreach($data as $row) + { + $import[] = array( + 'name' => $row['forum_name'], + 'url' => e107::url('forum','forum',$row, array('mode'=>'full')), // ('forum/forum/view', $row['forum_id']), + 'type' => LAN_PLUGIN_FORUM_NAME + ); + + } + + return $import; + } + + + +} diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php index 03193da0d..266cf2584 100644 --- a/e107_plugins/gsitemap/admin_config.php +++ b/e107_plugins/gsitemap/admin_config.php @@ -18,7 +18,7 @@ if(!getperms("P") || !e107::isInstalled('gsitemap')) require_once(e_ADMIN."auth.php"); require_once(e_HANDLER."userclass_class.php"); -e107::lan('gsitemap',e_LANGUAGE."_admin_gsitemap.php"); +e107::lan('gsitemap',true); $gsm = new gsitemap; @@ -381,44 +381,27 @@ class gsitemap - /* forums ... */ - if(e107::isInstalled('forum')) - { - $sql -> select("forum", "*", "forum_parent!='0' ORDER BY forum_order ASC"); - $nfArray = $sql -> db_getList(); - foreach($nfArray as $row) + /* Plugins.. - currently: forums ... */ + $addons = e107::getAddonConfig('e_gsitemap', null, 'import'); + + foreach($addons as $plug => $config) + { + + foreach($config as $row) { - if(!in_array($row['forum_name'], $existing)) + if(!in_array($row['name'], $existing)) { - $importArray[] = array('name' => $row['forum_name'], 'url' => e107::getUrl()->create('forum/forum/view', $row['forum_id']), 'type' => "Forum"); + $importArray[] = $row; } } + } - - /* DEPRECATED content pages ... - if(e107::isInstalled('content')) - { - $sql -> select("pcontent", "content_id, content_heading", "LEFT(content_parent,1) = '0' ORDER BY content_heading"); - $nfArray = $sql -> db_getList(); - foreach($nfArray as $row) - { - $sql2 -> select("pcontent", "content_id, content_heading", "content_parent = '".$row['content_id']."' AND content_refer != 'sa' ORDER BY content_heading"); - $nfArray2 = $sql2 -> db_getList(); - foreach($nfArray2 as $row2) - { - if(!$sql -> select("gsitemap", "*", "gsitemap_name='".$row2['content_heading']."' ")) - { - $importArray[] = array('name' => $row2['content_heading'], 'url' => $PLUGINS_DIRECTORY."content/content.php?content.".$row2['content_id'], 'type' => $row['content_heading']); - } - } - } - } - */ + $editArray = $_POST; $text = "
- +
@@ -427,21 +410,22 @@ class gsitemap - - - - + + + + "; - foreach($importArray as $ia) + foreach($importArray as $k=>$ia) { + $id = 'gs-'.$k; $text .= " - - + + @@ -451,17 +435,16 @@ class gsitemap $text .= "
".GSLAN_2."".LAN_TYPE."".LAN_NAME."".LAN_URL."".GSLAN_2."".LAN_TYPE."".LAN_NAME."".LAN_URL."
".$ia['type']." ".$ia['name']." ".str_replace(SITEURL,"",$ia['url'])."
-
".GSLAN_8."   ".GSLAN_9." : \n"; for ($i=0.1; $i<1.0; $i=$i+0.1) { $sel = (vartrue($editArray['gsitemap_priority']) == number_format($i,1))? "selected='selected'" : ""; $text .= "\n"; - }; + } $text.="   ".GSLAN_10." -

+ $text .= "

@@ -479,7 +462,7 @@ class gsitemap
". - $frm->admin_button('import_links',GSLAN_18,'submit')." + $frm->admin_button('import_links',GSLAN_18,'submit')."
";