aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/comanche.php3
-rw-r--r--include/language.php17
-rw-r--r--include/network.php5
-rw-r--r--include/text.php2
-rw-r--r--mod/probe.php3
-rw-r--r--version.inc2
6 files changed, 27 insertions, 5 deletions
diff --git a/include/comanche.php b/include/comanche.php
index f385f3c5a..3030ae5c6 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -245,6 +245,9 @@ function comanche_widget($name, $text) {
}
}
+ if(file_exists('widget/' . trim($name) . '.php'))
+ require_once('widget/' . trim($name) . '.php');
+
$func = 'widget_' . trim($name);
if (function_exists($func))
return $func($vars);
diff --git a/include/language.php b/include/language.php
index 1e8528dc1..0af72142f 100644
--- a/include/language.php
+++ b/include/language.php
@@ -159,13 +159,26 @@ function t($s, $ctx = '') {
if (x($a->strings, $cs)) {
$t = $a->strings[$cs];
- return is_array($t) ? $t[0] : $t;
+ return ((is_array($t)) ? translate_product($t[0]) : translate_product($t));
}
- return $s;
+ return translate_product($s);
}
/**
+ * @brief translate product name
+ * Merging strings from different project names is problematic so we'll do that with a string replacement
+ */
+
+function translate_product($s) {
+
+ return str_replace(array('$product','$Product'),array(RED_PLATFORM,ucfirst(RED_PLATFORM)),$s);
+
+}
+
+
+
+/**
* @brief
*
* @param string $singular
diff --git a/include/network.php b/include/network.php
index a0782692e..e0c8885fd 100644
--- a/include/network.php
+++ b/include/network.php
@@ -603,7 +603,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
$scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[3]);
else
$scaled = $mtch[3];
- $i = z_fetch_url($scaled);
+ $i = z_fetch_url($scaled,true);
$cache = get_config('system','itemcache');
@@ -613,7 +613,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
}
// guess mimetype from headers or filename
+
$type = guess_image_type($mtch[3],$i['header']);
+ if(strpos($type,'image') === false)
+ continue;
if($i['success']) {
$ph = photo_factory($i['body'], $type);
diff --git a/include/text.php b/include/text.php
index c7b662879..3004d9f07 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2244,7 +2244,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
// The '=' is needed to not replace color codes if the code is also used as a tag
// Much better would be to somehow completely avoiding things in e.g. [color]-tags.
// This would allow writing things like "my favourite tag=#foobar".
- $body = preg_replace('/(?<![a-zA-Z0-9=])'.preg_quote($tag).'/', $newtag, $body);
+ $body = preg_replace('/(?<![a-zA-Z0-9=])'.preg_quote($tag,'/').'/', $newtag, $body);
$replaced = true;
}
//is the link already in str_tags?
diff --git a/mod/probe.php b/mod/probe.php
index 8e0b60dcc..62a2227b0 100644
--- a/mod/probe.php
+++ b/mod/probe.php
@@ -15,6 +15,7 @@ function probe_content(&$a) {
if(x($_GET,'addr')) {
$channel = $a->get_channel();
$addr = trim($_GET['addr']);
+ $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false);
$res = zot_finger($addr,$channel,false);
$o .= '<pre>';
if($res['success'])
@@ -29,6 +30,8 @@ function probe_content(&$a) {
$o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
}
+ if($do_import && $j)
+ $x = import_xchan($j);
if($j && $j['permissions'] && $j['permissions']['iv'])
$j['permissions'] = json_decode(crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']),true);
$o .= str_replace("\n",'<br />',print_r($j,true));
diff --git a/version.inc b/version.inc
index 387119390..574787527 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-10.1028
+2015-05-12.1030