aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-21 17:13:48 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-21 17:13:48 -0700
commitc90f14c066d0f289bd2220bb66325db12700aa57 (patch)
tree6c915ad03936d479d1d807540bbc0e7ae0f854ad /include
parent24ec104819bbc3778a159ea4790398988a6e2fd7 (diff)
parent3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff)
downloadvolse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.gz
volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.bz2
volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: doc/to_do_code.bb
Diffstat (limited to 'include')
-rw-r--r--include/event.php2
-rw-r--r--include/identity.php4
-rwxr-xr-xinclude/items.php9
-rw-r--r--include/network.php2
-rw-r--r--include/photo/photo_driver.php8
5 files changed, 17 insertions, 8 deletions
diff --git a/include/event.php b/include/event.php
index 0d8b2132b..d2ae617f8 100644
--- a/include/event.php
+++ b/include/event.php
@@ -100,7 +100,7 @@ function format_ical_text($s) {
require_once('include/bbcode.php');
require_once('include/html2plain.php');
- return(wordwrap(html2plain(bbcode($s)),72,"\n ",true));
+ return(wordwrap(str_replace(',','\\,',html2plain(bbcode($s))),72,"\n ",true));
}
diff --git a/include/identity.php b/include/identity.php
index b0d62fba7..804f316d1 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1392,10 +1392,10 @@ function get_theme_uid() {
* with the specified size.
*
* @param int $size
-* one of (175, 80, 48)
+* one of (300, 80, 48)
* @returns string
*/
-function get_default_profile_photo($size = 175) {
+function get_default_profile_photo($size = 300) {
$scheme = get_config('system','default_profile_photo');
if(! $scheme)
$scheme = 'rainbow_man';
diff --git a/include/items.php b/include/items.php
index af57e3eda..af76fe203 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3384,6 +3384,11 @@ function post_is_importable($item,$abook) {
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
+ $lang = null;
+
+ if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_incl'],'lang=') !== false))
+ $lang = detect_language($text);
+
$tags = ((count($item['term'])) ? $item['term'] : false);
// exclude always has priority
@@ -3400,6 +3405,8 @@ function post_is_importable($item,$abook) {
}
elseif((strpos($word,'/') === 0) && preg_match($word,$body))
return false;
+ elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
+ return false;
elseif(stristr($text,$word) !== false)
return false;
}
@@ -3417,6 +3424,8 @@ function post_is_importable($item,$abook) {
}
elseif((strpos($word,'/') === 0) && preg_match($word,$body))
return true;
+ elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
+ return true;
elseif(stristr($text,$word) !== false)
return true;
}
diff --git a/include/network.php b/include/network.php
index f331da488..5173bc3d0 100644
--- a/include/network.php
+++ b/include/network.php
@@ -531,7 +531,7 @@ function avatar_img($email) {
$avatar = array();
$a = get_app();
- $avatar['size'] = 175;
+ $avatar['size'] = 300;
$avatar['email'] = $email;
$avatar['url'] = '';
$avatar['success'] = false;
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 1501e6712..426eb6aac 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -605,16 +605,16 @@ function import_profile_photo($photo,$xchan,$thing = false) {
if(($width / $height) > 1.2) {
// crop out the sides
$margin = $width - $height;
- $img->cropImage(175,($margin / 2),0,$height,$height);
+ $img->cropImage(300,($margin / 2),0,$height,$height);
}
elseif(($height / $width) > 1.2) {
// crop out the bottom
$margin = $height - $width;
- $img->cropImage(175,0,0,$width,$width);
+ $img->cropImage(300,0,0,$width,$width);
}
else {
- $img->scaleImageSquare(175);
+ $img->scaleImageSquare(300);
}
}
@@ -681,7 +681,7 @@ function import_channel_photo($photo,$type,$aid,$uid) {
$img = photo_factory($photo, $type);
if($img->is_valid()) {
- $img->scaleImageSquare(175);
+ $img->scaleImageSquare(300);
$p = array('aid' => $aid, 'uid' => $uid, 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'photo_usage' => PHOTO_PROFILE, 'scale' => 4);