aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/bbcode.php19
-rw-r--r--include/conversation.php1
-rw-r--r--include/language.php52
-rw-r--r--include/zot.php4
-rw-r--r--index.php9
-rw-r--r--view/theme/redbasic/css/style.css4
6 files changed, 50 insertions, 39 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 021f2ac27..0a40313a4 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -151,15 +151,15 @@ function bb_ShareAttributes($match) {
$headline = '<div class="shared_header">';
- if ($avatar != "")
- $headline .= '<img src="'.$avatar.'" height="32" width="32" >';
+ if ($avatar != "")
+ $headline .= '<img src="'.$avatar.'" height="32" width="32" />';
- $headline .= sprintf(t('<span><a href="%s" target="external-link">%s</a> wrote the following <a href="%s" target="external-link">post</a>'.$reldate.':</span>'), $profile, $author, $link);
+ $headline .= sprintf(t('<span><a href="%s">%s</a> wrote the following <a href="%s">post</a>'.$reldate.':</span>'), $profile, $author, $link);
$headline .= "</div>";
- $text = $headline.'<blockquote class="shared_content">'.trim($match[2])."</blockquote>";
-
+ $text = $headline . '<div style="reshared-content">' . trim($match[2]) . '</div>';
+ logger('bbshare: ' . $text);
return($text);
}
@@ -232,9 +232,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = str_replace("<", "&lt;", $Text);
$Text = str_replace(">", "&gt;", $Text);
- // This only matters when looking for tags - otherwise has no meaning
-
- $Text = str_replace(array('[share]','[/share]'), array('',''), $Text);
// Convert new line chars to html <br /> tags
@@ -259,13 +256,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Perform URL Search
- $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" >$2</a>', $Text);
+ $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" >$2</a>', $Text);
if ($tryoembed)
$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text);
+ $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
+
if ($tryoembed)
$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
@@ -402,7 +401,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// [img]pathtoimage[/img]
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
- $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
+
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
diff --git a/include/conversation.php b/include/conversation.php
index 06bc7ff70..9a2ddd151 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -652,6 +652,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
else
{
// Normal View
+// logger('conv: items: ' . print_r($items,true));
require_once('include/ConversationObject.php');
require_once('include/ItemObject.php');
diff --git a/include/language.php b/include/language.php
index 24a6a08ca..2e7ad5ff1 100644
--- a/include/language.php
+++ b/include/language.php
@@ -20,22 +20,22 @@ function get_browser_language() {
$langs = array();
if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
- // break up string into pieces (languages and q factors)
- preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
+ // break up string into pieces (languages and q factors)
+ preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
- if (count($lang_parse[1])) {
- // create a list like "en" => 0.8
- $langs = array_combine($lang_parse[1], $lang_parse[4]);
-
- // set default to 1 for any without q factor
- foreach ($langs as $lang => $val) {
- if ($val === '') $langs[$lang] = 1;
- }
-
- // sort list based on value
- arsort($langs, SORT_NUMERIC);
- }
+ if (count($lang_parse[1])) {
+ // create a list like "en" => 0.8
+ $langs = array_combine($lang_parse[1], $lang_parse[4]);
+
+ // set default to 1 for any without q factor
+ foreach ($langs as $lang => $val) {
+ if ($val === '') $langs[$lang] = 1;
+ }
+
+ // sort list based on value
+ arsort($langs, SORT_NUMERIC);
+ }
}
else
$langs['en'] = 1;
@@ -60,7 +60,7 @@ function get_best_language() {
if(isset($preferred))
return $preferred;
- $a = get_app();
+ $a = get_app();
return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
}
@@ -99,7 +99,7 @@ function pop_lang() {
// load string translation table for alternate language
-function load_translation_table($lang) {
+function load_translation_table($lang, $install = false) {
global $a;
$a->strings = array();
@@ -107,15 +107,17 @@ function load_translation_table($lang) {
include("view/$lang/strings.php");
}
- $plugins = q("SELECT name FROM addon WHERE installed=1;");
- if ($plugins!==false) {
- foreach($plugins as $p) {
- $name = $p['name'];
- if(file_exists("addon/$name/lang/$lang/strings.php")) {
- include("addon/$name/lang/$lang/strings.php");
- }
- }
- }
+ if(! $install) {
+ $plugins = q("SELECT name FROM addon WHERE installed=1;");
+ if ($plugins!==false) {
+ foreach($plugins as $p) {
+ $name = $p['name'];
+ if(file_exists("addon/$name/lang/$lang/strings.php")) {
+ include("addon/$name/lang/$lang/strings.php");
+ }
+ }
+ }
+ }
// Allow individual strings to be over-ridden on this site
// Either for the default language or for all languages
diff --git a/include/zot.php b/include/zot.php
index e5b6ac56a..4bbf6ef25 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -520,7 +520,7 @@ function import_xchan($arr) {
}
for($x = 0; $x < count($xisting); $x ++) {
- if($xisiting[$x]['hubloc_url'] == $location['url']) {
+ if($xisting[$x]['hubloc_url'] == $location['url']) {
$xisting[$x]['updated'] = true;
}
}
@@ -567,10 +567,10 @@ function import_xchan($arr) {
}
// get rid of any hubs we have for this channel which weren't reported.
-
if($xisting) {
foreach($xisting as $x) {
if(! array_key_exists('updated',$x)) {
+ logger('import_xchan: removing unreferenced hub location ' . $x['hubloc_url');
$r = q("delete from hubloc where hubloc_id = %d limit 1",
intval($x['hubloc_id'])
);
diff --git a/index.php b/index.php
index cc6249256..8d59a8a8e 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
$a->language = get_best_language();
-load_translation_table($a->language);
/**
*
@@ -53,9 +52,17 @@ if(! $install) {
require_once("session.php");
load_hooks();
call_hooks('init_1');
+
+ load_translation_table($a->language);
+}
+else {
+ // load translations but do not check plugins as we have no database
+ load_translation_table($a->language,true);
}
+
+
/**
*
* Important stuff we always need to do.
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6c168be56..955478e10 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3751,4 +3751,6 @@ ul.menu-popup {
margin-top: 8px;
}
-.profile-match-connect { margin-top: 5px; } \ No newline at end of file
+.profile-match-connect { margin-top: 5px; }
+
+.reshared-content { margin-left: 10px; } \ No newline at end of file