@@ -221,7 +221,7 @@ class Archives | |||||
if ($this->Fields['litpic'] == '-' || $this->Fields['litpic'] == '') { | if ($this->Fields['litpic'] == '-' || $this->Fields['litpic'] == '') { | ||||
$this->Fields['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $this->Fields['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("#^http:\/\/#i", $this->Fields['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $this->Fields['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$this->Fields['litpic'] = $GLOBALS['cfg_mainsite'].$this->Fields['litpic']; | $this->Fields['litpic'] = $GLOBALS['cfg_mainsite'].$this->Fields['litpic']; | ||||
} | } | ||||
$this->Fields['picname'] = $this->Fields['litpic']; | $this->Fields['picname'] = $this->Fields['litpic']; | ||||
@@ -542,9 +542,9 @@ class FreeList | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
/*if (!preg_match("#^http:\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
}*/ | |||||
} | |||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
$row['info'] = $row['description']; | $row['info'] = $row['description']; | ||||
$row['filename'] = $row['arcurl']; | $row['filename'] = $row['arcurl']; | ||||
@@ -539,9 +539,9 @@ class ListView | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
/*if (!preg_match("/^http:\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
}*/ | |||||
} | |||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
$row['stime'] = GetDateMK($row['pubdate']); | $row['stime'] = GetDateMK($row['pubdate']); | ||||
$row['typelink'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>"; | $row['typelink'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>"; | ||||
@@ -971,9 +971,9 @@ class ListView | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
/*if (!preg_match("/^http:\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
}*/ | |||||
} | |||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
$row['stime'] = GetDateMK($row['pubdate']); | $row['stime'] = GetDateMK($row['pubdate']); | ||||
$row['typelink'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>"; | $row['typelink'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>"; | ||||
@@ -575,9 +575,9 @@ class SearchView | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
/*if (!preg_match("/^(http|https):\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
}*/ | |||||
} | |||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
$row["typeurl"] = GetTypeUrl($row["typeid"], $row["typedir"], $row["isdefault"], $row["defaultname"], $row["ispart"], $row["namerule2"], $row["moresite"], $row["siteurl"], $row["sitepath"]); | $row["typeurl"] = GetTypeUrl($row["typeid"], $row["typedir"], $row["isdefault"], $row["defaultname"], $row["ispart"], $row["namerule2"], $row["moresite"], $row["siteurl"], $row["sitepath"]); | ||||
$row["info"] = $row["description"]; | $row["info"] = $row["description"]; | ||||
@@ -447,9 +447,9 @@ class SgListView | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
/*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
}*/ | |||||
} | |||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
$row['pubdate'] = $row['senddate']; | $row['pubdate'] = $row['senddate']; | ||||
$row['stime'] = GetDateMK($row['pubdate']); | $row['stime'] = GetDateMK($row['pubdate']); | ||||
@@ -810,7 +810,7 @@ class SgListView | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
} | } | ||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
@@ -350,7 +350,7 @@ class SpecView | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
} | } | ||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
@@ -342,9 +342,9 @@ class TagList | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
/*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
}*/ | |||||
} | |||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
$row['stime'] = GetDateMK($row['pubdate']); | $row['stime'] = GetDateMK($row['pubdate']); | ||||
$row['typelink'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>"; | $row['typelink'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>"; | ||||
@@ -348,7 +348,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
} | } | ||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
@@ -180,7 +180,7 @@ function lib_arclistsg(&$ctag, &$refObj) | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
} | } | ||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
@@ -124,7 +124,7 @@ function lib_likearticle(&$ctag, &$refObj) | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
} | } | ||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||
@@ -110,7 +110,7 @@ function lib_relation(&$ctag, &$refObj) | |||||
if ($row['litpic'] == '-' || $row['litpic'] == '') { | if ($row['litpic'] == '-' || $row['litpic'] == '') { | ||||
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; | ||||
} | } | ||||
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { | |||||
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; | ||||
} | } | ||||
$row['picname'] = $row['litpic']; | $row['picname'] = $row['litpic']; | ||||