aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addon/facebook/facebook.php57
-rw-r--r--boot.php21
-rw-r--r--doc/Home.md4
-rw-r--r--htconfig.php2
-rw-r--r--include/Photo.php12
-rw-r--r--include/bbcode.php2
-rw-r--r--include/conversation.php5
-rw-r--r--include/items.php46
-rw-r--r--index.php2
-rw-r--r--mod/editpost.php1
-rw-r--r--mod/item.php3
-rw-r--r--mod/network.php4
-rw-r--r--mod/photos.php3
-rw-r--r--util/messages.po168
-rw-r--r--util/strings.php3
-rw-r--r--view/de/htconfig.tpl2
-rw-r--r--view/en/htconfig.tpl2
-rw-r--r--view/es/htconfig.tpl2
-rw-r--r--view/fr/htconfig.tpl2
-rw-r--r--view/it/htconfig.tpl2
-rw-r--r--view/jot-header.tpl18
-rw-r--r--view/sv/htconfig.tpl2
-rw-r--r--view/theme/duepuntozero/style.css6
23 files changed, 249 insertions, 120 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index c7821b272..8fe6f3717 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -291,8 +291,12 @@ function facebook_cron($a,$b) {
$last = get_config('facebook','last_poll');
+ $poll_interval = intval(get_config('facebook','poll_interval'));
+ if(! $poll_interval)
+ $poll_interval = 3600;
+
if($last) {
- $next = $last + 3600;
+ $next = $last + $poll_interval;
if($next > time())
return;
}
@@ -379,18 +383,23 @@ function facebook_post_hook(&$a,&$b) {
$deny = array_unique(array_merge($deny_people,$deny_groups));
$allow_str = dbesc(implode(', ',$recipients));
- $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'");
- $allow_arr = array();
- if(count($r))
- foreach($r as $rr)
- $allow_arr[] = $rr['notify'];
+ if($allow_str) {
+ $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'");
+ $allow_arr = array();
+ if(count($r))
+ foreach($r as $rr)
+ $allow_arr[] = $rr['notify'];
+ }
$deny_str = dbesc(implode(', ',$deny));
- $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'");
- $deny_arr = array();
- if(count($r))
- foreach($r as $rr)
- $deny_arr[] = $rr['notify'];
+ if($deny_str) {
+ $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'");
+ $deny_arr = array();
+ if(count($r))
+ foreach($r as $rr)
+ $deny_arr[] = $rr['notify'];
+ }
+
if(count($deny_arr) && (! count($allow_arr))) {
// One or more FB folks were denied access but nobody on FB was specifically allowed access.
@@ -442,10 +451,22 @@ function facebook_post_hook(&$a,&$b) {
// make links readable before we strip the code
+ if(preg_match("/\[url=(.+?)\](.+?)\[\/url\]/is",$msg,$matches)) {
+
+ $link = $matches[1];
+ if(substr($matches[2],0,5) != '[img]' )
+ $linkname = $matches[2];
+ }
+
$msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg);
+ if(preg_match("/\[img\](.+?)\[\/img\]/is",$msg,$matches))
+ $image = $matches[1];
+
$msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1', $msg);
+
+
$msg = trim(strip_tags(bbcode($msg)));
$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
@@ -478,6 +499,12 @@ function facebook_post_hook(&$a,&$b) {
'access_token' => $fb_token,
'message' => $msg
);
+ if(isset($image))
+ $postvars['picture'] = $image;
+ if(isset($link))
+ $postvars['link'] = $link;
+ if(isset($linkname))
+ $postvars['name'] = $linkname;
}
if(($b['private']) && (! $b['parent'])) {
@@ -490,17 +517,15 @@ function facebook_post_hook(&$a,&$b) {
}
- if(! $reply) {
- if($b['plink'])
- $postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' . $b['plink'] . '"}';
- }
-
if($reply) {
$url = 'https://graph.facebook.com/' . $reply . '/' . (($likes) ? 'likes' : 'comments');
}
else {
$url = 'https://graph.facebook.com/me/feed';
+ if($b['plink'])
+ $postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' . $b['plink'] . '"}';
}
+
logger('facebook: post to ' . $url);
logger('facebook: postvars: ' . print_r($postvars,true));
diff --git a/boot.php b/boot.php
index 4e2379469..67e3d65ae 100644
--- a/boot.php
+++ b/boot.php
@@ -1,15 +1,26 @@
<?php
set_time_limit(0);
+ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.1.962' );
+define ( 'FRIENDIKA_VERSION', '2.1.969' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'DOWN_ARROW', '&#x21e9;' );
-
+
+/**
+ *
+ * Image storage quality. Lower numbers save space at cost of image detail.
+ * For ease of upgrade, please do not change here. Change jpeg quality with
+ * set_config('system','jpeg_quality',n) in .htconfig.php
+ * where n is netween 1 and 100, and with very poor results below about 50
+ *
+ */
+
+define ( 'JPEG_QUALITY', 100 );
/**
* SSL redirection policies
@@ -845,8 +856,10 @@ function login($register = false) {
$tpl = load_view_file("view/login.tpl");
}
-
- $o = replace_macros($tpl,array(
+
+ $o = '<script type="text/javascript"> $(document).ready(function() { $("#login-name").focus();} );</script>';
+
+ $o .= replace_macros($tpl,array(
'$logout' => t('Logout'),
'$register_html' => $register_html,
'$classname' => $classname,
diff --git a/doc/Home.md b/doc/Home.md
index 838e63065..cf4946f95 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -28,3 +28,7 @@ Friendika Documentation and Resources
* [Forums](http://groups.google.com/group/friendika)
* [Developer Forums](http://groups.google.com/group/friendika-dev)
+**About**
+
+* [Site/Version Info](friendika)
+
diff --git a/htconfig.php b/htconfig.php
index fb62245d2..0f9222ac5 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -38,7 +38,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/include/Photo.php b/include/Photo.php
index 9934b9a39..707b0de5d 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -162,12 +162,20 @@ class Photo {
}
public function saveImage($path) {
- imagejpeg($this->image,$path,100);
+ $quality = get_config('system','jpeg_quality');
+ if((! $quality) || ($quality > 100))
+ $quality = JPEG_QUALITY;
+ imagejpeg($this->image,$path,$quality);
}
public function imageString() {
ob_start();
- imagejpeg($this->image,NULL,100);
+
+ $quality = get_config('system','jpeg_quality');
+ if((! $quality) || ($quality > 100))
+ $quality = JPEG_QUALITY;
+
+ imagejpeg($this->image,NULL,$quality);
$s = ob_get_contents();
ob_end_clean();
return $s;
diff --git a/include/bbcode.php b/include/bbcode.php
index 6fadbaf7e..89a14988a 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -80,7 +80,7 @@ function bbcode($Text,$preserve_nl = false) {
// Images
// [img]pathtoimage[/img]
- $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1">', $Text);
+ $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
// html5 video and audio
diff --git a/include/conversation.php b/include/conversation.php
index b3e424e52..7c30c01c2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -225,7 +225,7 @@ function conversation(&$a, $items, $mode, $update) {
$comments = array();
foreach($items as $item) {
- if(intval($item['gravity']) == 6) {
+ if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
if(! x($comments,$item['parent']))
$comments[$item['parent']] = 1;
else
@@ -687,6 +687,7 @@ function status_editor($a,$x) {
'$baseurl' => $a->get_baseurl(),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
+ '$ispublic' => t('Visible to <strong>everybody</strong>'),
'$linkurl' => t('Please enter a link URL:'),
'$utubeurl' => t('Please enter a YouTube link:'),
'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
@@ -745,7 +746,7 @@ function status_editor($a,$x) {
'$content' => '',
'$post_id' => '',
'$baseurl' => $a->get_baseurl(),
- '$defloc' => $x['default-location'],
+ '$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
'$emailcc' => t('CC: email addresses'),
'$jotnets' => $jotnets,
diff --git a/include/items.php b/include/items.php
index 733cd8048..3a3085f1b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -701,6 +701,7 @@ function item_store($arr,$force_parent = false) {
$parent_id = 0;
$arr['thr-parent'] = $arr['parent-uri'];
$arr['parent-uri'] = $arr['uri'];
+ $arr['gravity'] = 0;
}
else {
logger('item_store: item parent was not found - ignoring item');
@@ -1496,10 +1497,17 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
function atom_entry($item,$type,$author,$owner,$comment = false) {
+ $a = get_app();
+
if($item['deleted'])
return '<at:deleted-entry ref="' . xmlify($item['uri']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
- $a = get_app();
+
+ if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+ $body = fix_private_photos($item['body'],$owner['uid']);
+ else
+ $body = $item['body'];
+
$o = "\r\n\r\n<entry>\r\n";
@@ -1517,8 +1525,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
$o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
- $o .= '<dfrn:env>' . base64url_encode($item['body'], true) . '</dfrn:env>' . "\r\n";
- $o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($item['body']) : $item['body']) . '</content>' . "\r\n";
+ $o .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
+ $o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($body) : $body) . '</content>' . "\r\n";
$o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
if($comment)
$o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
@@ -1563,6 +1571,38 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
return $o;
}
+function fix_private_photos($s,$uid) {
+ $a = get_app();
+ logger('fix_private_photos');
+
+ if(preg_match("/\[img\](.+?)\[\/img\]/is",$s,$matches)) {
+ $image = $matches[1];
+ logger('fix_private_photos: found photo ' . $image);
+ if(stristr($image ,$a->get_baseurl() . '/photo/')) {
+ $i = basename($image);
+ $i = str_replace('.jpg','',$i);
+ $x = strpos($i,'-');
+ if($x) {
+ $res = substr($i,$x+1);
+ $i = substr($i,0,$x);
+ $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d",
+ dbesc($i),
+ intval($res),
+ intval($uid)
+ );
+ if(count($r)) {
+ logger('replacing photo');
+ $s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
+ }
+ }
+ logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
+ }
+ }
+ return($s);
+}
+
+
+
function item_getfeedtags($item) {
$ret = array();
$matches = false;
diff --git a/index.php b/index.php
index 074c1c53a..05eef6c6e 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,7 @@
<?php
+
error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
/**
*
* Friendika
diff --git a/mod/editpost.php b/mod/editpost.php
index 3c92e8bbe..fd84fc26d 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -35,6 +35,7 @@ function editpost_content(&$a) {
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
+ '$ispublic' => t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
));
diff --git a/mod/item.php b/mod/item.php
index 7b561fcca..c4f368fd0 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -671,7 +671,8 @@ function item_content(&$a) {
// send the notification upstream/downstream as the case may be
proc_run('php',"include/notifier.php","drop","$drop_id");
-
+// We seem to lose the return url occasionally. Have not been able to reliably duplicate
+// logger('drop_return_url: ' . $_SESSION['return_url']);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED
}
diff --git a/mod/network.php b/mod/network.php
index ae991e6ee..7ad5058bf 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -137,7 +137,7 @@ function network_content(&$a, $update = 0) {
notice( t('Group is empty'));
}
- $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
+ $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
}
elseif($cid) {
@@ -164,11 +164,13 @@ function network_content(&$a, $update = 0) {
if((! $group) && (! $cid) && (! $update))
$o .= get_birthdays();
+ $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ $sql_extra2
$sql_extra ",
intval($_SESSION['uid'])
);
diff --git a/mod/photos.php b/mod/photos.php
index 5f4c5b391..7f94bc520 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -639,6 +639,9 @@ foreach($_FILES AS $key => $val) {
$item_id = item_store($arr);
+ if($visible)
+ proc_run('php', "include/notifier.php", 'wall-new', $item_id);
+
call_hooks('photo_post_end',intval($item_id));
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
diff --git a/util/messages.po b/util/messages.po
index 415934443..d70504f23 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.1.961\n"
+"Project-Id-Version: 2.1.967\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 04:23-0700\n"
+"POT-Creation-Date: 2011-05-02 20:13-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
#: ../../mod/settings.php:251 ../../mod/manage.php:75 ../../mod/network.php:6
#: ../../mod/group.php:19 ../../mod/viewcontacts.php:21
#: ../../mod/register.php:25 ../../mod/regmod.php:16 ../../mod/item.php:57
-#: ../../mod/item.php:679 ../../mod/profile_photo.php:19
+#: ../../mod/item.php:680 ../../mod/profile_photo.php:19
#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144
#: ../../mod/profile_photo.php:155 ../../mod/message.php:8
#: ../../mod/message.php:116 ../../mod/wall_upload.php:42
@@ -103,7 +103,7 @@ msgstr ""
#: ../../mod/install.php:133 ../../mod/contacts.php:264
#: ../../mod/settings.php:426 ../../mod/manage.php:106 ../../mod/group.php:76
#: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:68
-#: ../../addon/facebook/facebook.php:262
+#: ../../addon/facebook/facebook.php:268
#: ../../addon/randplace/randplace.php:179
#: ../../addon/statusnet/statusnet.php:163
#: ../../addon/statusnet/statusnet.php:189
@@ -350,13 +350,13 @@ msgid "I don't like this (toggle)"
msgstr ""
#: ../../mod/photos.php:1099 ../../include/conversation.php:367
-#: ../../include/conversation.php:734
+#: ../../include/conversation.php:735
msgid "Share"
msgstr ""
#: ../../mod/photos.php:1100 ../../mod/editpost.php:95
#: ../../mod/message.php:190 ../../mod/message.php:324
-#: ../../include/conversation.php:368 ../../include/conversation.php:743
+#: ../../include/conversation.php:368 ../../include/conversation.php:744
msgid "Please wait"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
msgid "Edit post"
msgstr ""
-#: ../../mod/editpost.php:74 ../../include/conversation.php:723
+#: ../../mod/editpost.php:74 ../../include/conversation.php:724
msgid "Post to Email"
msgstr ""
@@ -412,44 +412,44 @@ msgid "Edit"
msgstr ""
#: ../../mod/editpost.php:88 ../../mod/message.php:188
-#: ../../mod/message.php:322 ../../include/conversation.php:735
+#: ../../mod/message.php:322 ../../include/conversation.php:736
msgid "Upload photo"
msgstr ""
#: ../../mod/editpost.php:89 ../../mod/message.php:189
-#: ../../mod/message.php:323 ../../include/conversation.php:736
+#: ../../mod/message.php:323 ../../include/conversation.php:737
msgid "Insert web link"
msgstr ""
-#: ../../mod/editpost.php:90 ../../include/conversation.php:737
+#: ../../mod/editpost.php:90 ../../include/conversation.php:738
msgid "Insert YouTube video"
msgstr ""
-#: ../../mod/editpost.php:91 ../../include/conversation.php:738
+#: ../../mod/editpost.php:91 ../../include/conversation.php:739
msgid "Insert Vorbis [.ogg] video"
msgstr ""
-#: ../../mod/editpost.php:92 ../../include/conversation.php:739
+#: ../../mod/editpost.php:92 ../../include/conversation.php:740
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
-#: ../../mod/editpost.php:93 ../../include/conversation.php:740
+#: ../../mod/editpost.php:93 ../../include/conversation.php:741
msgid "Set your location"
msgstr ""
-#: ../../mod/editpost.php:94 ../../include/conversation.php:741
+#: ../../mod/editpost.php:94 ../../include/conversation.php:742
msgid "Clear browser location"
msgstr ""
-#: ../../mod/editpost.php:96 ../../include/conversation.php:744
+#: ../../mod/editpost.php:96 ../../include/conversation.php:745
msgid "Permission settings"
msgstr ""
-#: ../../mod/editpost.php:102 ../../include/conversation.php:750
+#: ../../mod/editpost.php:102 ../../include/conversation.php:751
msgid "CC: email addresses"
msgstr ""
-#: ../../mod/editpost.php:104 ../../include/conversation.php:752
+#: ../../mod/editpost.php:104 ../../include/conversation.php:753
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
@@ -1610,7 +1610,7 @@ msgstr ""
msgid "All Contacts (with secure profile access)"
msgstr ""
-#: ../../mod/viewcontacts.php:25 ../../boot.php:1999
+#: ../../mod/viewcontacts.php:25 ../../boot.php:2001
msgid "View Contacts"
msgstr ""
@@ -1746,12 +1746,12 @@ msgstr ""
msgid "Register"
msgstr ""
-#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:679
+#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:720
#: ../../include/conversation.php:20
msgid "status"
msgstr ""
-#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:683
+#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:724
#: ../../include/conversation.php:25
#, php-format
msgid "%1$s likes %2$s's %3$s"
@@ -1981,7 +1981,7 @@ msgstr ""
msgid "Conversation removed."
msgstr ""
-#: ../../mod/message.php:172 ../../include/conversation.php:690
+#: ../../mod/message.php:172 ../../include/conversation.php:691
msgid "Please enter a link URL:"
msgstr ""
@@ -2025,7 +2025,7 @@ msgstr ""
msgid "Send Reply"
msgstr ""
-#: ../../mod/profile.php:11 ../../boot.php:2201
+#: ../../mod/profile.php:11 ../../boot.php:2203
msgid "No profile"
msgstr ""
@@ -2093,7 +2093,7 @@ msgstr ""
msgid "Applications"
msgstr ""
-#: ../../mod/search.php:26 ../../include/nav.php:71 ../../boot.php:2045
+#: ../../mod/search.php:26 ../../include/nav.php:71 ../../boot.php:2047
msgid "Search"
msgstr ""
@@ -2450,49 +2450,53 @@ msgstr ""
msgid "Facebook disabled"
msgstr ""
-#: ../../addon/facebook/facebook.php:235
+#: ../../addon/facebook/facebook.php:232
+msgid "Updating contacts"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:241
msgid "Facebook API key is missing."
msgstr ""
-#: ../../addon/facebook/facebook.php:242
+#: ../../addon/facebook/facebook.php:248
msgid "Facebook Connect"
msgstr ""
-#: ../../addon/facebook/facebook.php:248
+#: ../../addon/facebook/facebook.php:254
msgid "Install Facebook connector for this account."
msgstr ""
-#: ../../addon/facebook/facebook.php:255
+#: ../../addon/facebook/facebook.php:261
msgid "Remove Facebook connector"
msgstr ""
-#: ../../addon/facebook/facebook.php:261
+#: ../../addon/facebook/facebook.php:267
msgid "Post to Facebook by default"
msgstr ""
-#: ../../addon/facebook/facebook.php:319
+#: ../../addon/facebook/facebook.php:329
msgid "Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:320
+#: ../../addon/facebook/facebook.php:330
msgid "Facebook Connector Settings"
msgstr ""
-#: ../../addon/facebook/facebook.php:334
+#: ../../addon/facebook/facebook.php:344
msgid "Post to Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:396
+#: ../../addon/facebook/facebook.php:411
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
-#: ../../addon/facebook/facebook.php:441
+#: ../../addon/facebook/facebook.php:466
msgid "Image: "
msgstr ""
-#: ../../addon/facebook/facebook.php:489
+#: ../../addon/facebook/facebook.php:526
msgid "View on Friendika"
msgstr ""
@@ -2707,7 +2711,7 @@ msgstr ""
msgid "Send public postings to Twitter"
msgstr ""
-#: ../../include/profile_advanced.php:23 ../../boot.php:2287
+#: ../../include/profile_advanced.php:23 ../../boot.php:2289
msgid "Gender:"
msgstr ""
@@ -2731,7 +2735,7 @@ msgstr ""
msgid "<span class=\"heart\">&hearts;</span> Status:"
msgstr ""
-#: ../../include/profile_advanced.php:103 ../../boot.php:2293
+#: ../../include/profile_advanced.php:103 ../../boot.php:2295
msgid "Homepage:"
msgstr ""
@@ -3051,7 +3055,7 @@ msgstr ""
msgid "Everybody"
msgstr ""
-#: ../../include/nav.php:41 ../../boot.php:850
+#: ../../include/nav.php:41 ../../boot.php:852
msgid "Logout"
msgstr ""
@@ -3155,6 +3159,10 @@ msgstr ""
msgid " ago"
msgstr ""
+#: ../../include/bbcode.php:83
+msgid "Image/photo"
+msgstr ""
+
#: ../../include/dba.php:31
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
@@ -3270,27 +3278,31 @@ msgstr ""
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:691
-msgid "Please enter a YouTube link:"
+#: ../../include/conversation.php:690
+msgid "Visible to <strong>everybody</strong>"
msgstr ""
#: ../../include/conversation.php:692
-msgid "Please enter a video(.ogg) link/URL:"
+msgid "Please enter a YouTube link:"
msgstr ""
#: ../../include/conversation.php:693
-msgid "Please enter an audio(.ogg) link/URL:"
+msgid "Please enter a video(.ogg) link/URL:"
msgstr ""
#: ../../include/conversation.php:694
-msgid "Where are you right now?"
+msgid "Please enter an audio(.ogg) link/URL:"
msgstr ""
#: ../../include/conversation.php:695
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:696
msgid "Enter a title for this item"
msgstr ""
-#: ../../include/conversation.php:742
+#: ../../include/conversation.php:743
msgid "Set title"
msgstr ""
@@ -3322,146 +3334,146 @@ msgstr ""
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:1091
+#: ../../boot.php:1093
msgid "prev"
msgstr ""
-#: ../../boot.php:1093
+#: ../../boot.php:1095
msgid "first"
msgstr ""
-#: ../../boot.php:1122
+#: ../../boot.php:1124
msgid "last"
msgstr ""
-#: ../../boot.php:1125
+#: ../../boot.php:1127
msgid "next"
msgstr ""
-#: ../../boot.php:1986
+#: ../../boot.php:1988
msgid "No contacts"
msgstr ""
-#: ../../boot.php:1994
+#: ../../boot.php:1996
#, php-format
msgid "%d Contact"
msgid_plural "%d Contacts"
msgstr[0] ""
msgstr[1] ""
-#: ../../boot.php:2260
+#: ../../boot.php:2262
msgid "Connect"
msgstr ""
-#: ../../boot.php:2275
+#: ../../boot.php:2277
msgid "Location:"
msgstr ""
-#: ../../boot.php:2279
+#: ../../boot.php:2281
msgid ", "
msgstr ""
-#: ../../boot.php:2291
+#: ../../boot.php:2293
msgid "Status:"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Monday"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Tuesday"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Wednesday"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Thursday"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Friday"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Saturday"
msgstr ""
-#: ../../boot.php:2384
+#: ../../boot.php:2386
msgid "Sunday"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "January"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "February"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "March"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "April"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "May"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "June"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "July"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "August"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "September"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "October"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "November"
msgstr ""
-#: ../../boot.php:2388
+#: ../../boot.php:2390
msgid "December"
msgstr ""
-#: ../../boot.php:2403
+#: ../../boot.php:2405
msgid "g A l F d"
msgstr ""
-#: ../../boot.php:2420
+#: ../../boot.php:2422
msgid "Birthday Reminders"
msgstr ""
-#: ../../boot.php:2421
+#: ../../boot.php:2423
msgid "Birthdays this week:"
msgstr ""
-#: ../../boot.php:2422
+#: ../../boot.php:2424
msgid "(Adjusted for local time)"
msgstr ""
-#: ../../boot.php:2433
+#: ../../boot.php:2435
msgid "[today]"
msgstr ""
-#: ../../boot.php:2634
+#: ../../boot.php:2636
msgid "link to source"
msgstr ""
diff --git a/util/strings.php b/util/strings.php
index 48fcea4f9..0000e30f6 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -605,6 +605,7 @@ $a->strings['Visible To:'] = 'Visible To:';
$a->strings['Groups'] = 'Groups';
$a->strings['Except For:'] = 'Except For:';
$a->strings['Logged out.'] = 'Logged out.';
+$a->strings['Image/photo'] = 'Image/photo';
$a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised';
$a->strings['Block immediately'] = 'Block immediately';
$a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer';
@@ -632,6 +633,7 @@ $a->strings['and'] = 'and';
$a->strings[', and %d other people'] = ', and %d other people';
$a->strings['%s like this.'] = '%s like this.';
$a->strings['%s don\'t like this.'] = '%s don\'t like this.';
+$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
$a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
@@ -735,6 +737,7 @@ $a->strings['Complicated'] = 'Complicated';
$a->strings['Don\'t care'] = 'Don\'t care';
$a->strings['Ask me'] = 'Ask me';
$a->strings['Facebook disabled'] = 'Facebook disabled';
+$a->strings['Updating contacts'] = 'Updating contacts';
$a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.';
$a->strings['Facebook Connect'] = 'Facebook Connect';
$a->strings['Install Facebook connector for this account.'] = 'Install Facebook connector for this account.';
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index d3bb6b411..0ce28b4a0 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index d3bb6b411..0ce28b4a0 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 180f7885c..4de266112 100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index d31d5a39f..c65114a68 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 180f7885c..4de266112 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 0fdd30209..3b4c8c615 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -3,6 +3,7 @@
<script language="javascript" type="text/javascript">
var editor;
+var textlen = 0;
tinyMCE.init({
theme : "advanced",
@@ -29,23 +30,29 @@ tinyMCE.init({
//Character count
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
- var text = txt.length;
- if(txt.length <= 140) {
+ textlen = txt.length;
+ if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+ $('#profile-jot-desc').html(ispublic);
+ }
+ else {
+ $('#profile-jot-desc').html('&nbsp;');
+ }
+ if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
- if((txt.length > 140) && (txt .length <= 420)) {
+ if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
- if(txt.length > 420) {
+ if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
- $('#character-counter').text(text);
+ $('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
@@ -58,6 +65,7 @@ tinyMCE.init({
</script>
<script type="text/javascript" src="include/ajaxupload.js" ></script>
<script>
+ var ispublic = '$ispublic';
$(document).ready(function() {
var uploader = new window.AjaxUpload(
'wall-image-upload',
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index d3bb6b411..0ce28b4a0 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a23f72987..5f8f06a6c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1895,9 +1895,11 @@ a.mail-list-link {
#profile-jot-desc {
/*float: left;*/
width: 480px;
+ color: #FF0000;
margin-top: 10px;
margin-bottom: 10px;
}
+
#character-counter {
float: right;
font-size: 120%;
@@ -2347,6 +2349,10 @@ a.mail-list-link {
width: 300px;
}
+#contact-edit-links .icon, #contact-drop-links .icon {
+ margin: 0px 3px 0px 3px;
+}
+
/**
* ICONS
*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 04:37:53 +0000