aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot.php1
-rw-r--r--include/Photo.php2
-rw-r--r--include/bb2diaspora.php6
-rw-r--r--include/bbcode.php6
-rw-r--r--include/conversation.php3
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/markdownify/markdownify.php7
-rw-r--r--include/network.php13
-rw-r--r--include/zot.php7
-rw-r--r--mod/content.php1
-rw-r--r--mod/editpost.php6
-rw-r--r--mod/parse_url.php8
-rw-r--r--mod/photos.php1
-rw-r--r--update.php1
-rw-r--r--version.inc2
-rw-r--r--view/theme/darkzero/css/style.css2
-rw-r--r--view/theme/diabook/style-profile.css7
-rw-r--r--view/theme/diabook/style.css2
18 files changed, 56 insertions, 21 deletions
diff --git a/boot.php b/boot.php
index 2d796f197..8d7be178d 100644
--- a/boot.php
+++ b/boot.php
@@ -382,6 +382,7 @@ if(! class_exists('App')) {
public $plugins;
public $apps = array();
public $identities;
+ public $sourcename = '';
public $nav_sel;
diff --git a/include/Photo.php b/include/Photo.php
index e870a2507..d5e9ac9e6 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -247,7 +247,7 @@ class Photo {
if($this->is_imagick()) {
$this->image->setFirstIterator();
do {
- $this->image->rotateImage(new ImagickPixel(), $degrees);
+ $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
} while ($this->image->nextImage());
return;
}
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index b95dee8f3..9ede42f6c 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -202,9 +202,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// the following was added on 10-January-2012 due to an inability of Diaspora's
// new javascript markdown processor to handle links with images as the link "text"
// It is not optimal and may be removed if this ability is restored in the future
- if ($fordiaspora)
- $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
- "[url]$1[/url]\n[img]$2[/img]", $Text);
+ //if ($fordiaspora)
+ // $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
+ // "[url]$1[/url]\n[img]$2[/img]", $Text);
// Convert it to HTML - don't try oembed
$Text = bbcode($Text, $preserve_nl, false);
diff --git a/include/bbcode.php b/include/bbcode.php
index de848de99..2a4b4592b 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -224,6 +224,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Check for list text
$Text = str_replace("[*]", "<li>", $Text);
+ // Check for style sheet commands
+ $Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","<span style=\"$1;\">$2</span>",$Text);
+
+ // Check for CSS classes
+ $Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","<span class=\"$1\">$2</span>",$Text);
+
// handle nested lists
$endlessloop = 0;
diff --git a/include/conversation.php b/include/conversation.php
index 74cf787bd..a1188d0c6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -722,6 +722,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
'$preview' => t('Preview'),
+ '$sourceapp' => t($a->sourcename),
'$ww' => (($mode === 'network') ? $commentww : '')
));
}
@@ -1210,7 +1211,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'),
- '$mobileapp' => t('Friendica mobile web'),
+ '$sourceapp' => t($a->sourcename),
));
diff --git a/include/items.php b/include/items.php
index 2381dd2ea..7e49f4b82 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3589,7 +3589,7 @@ function drop_item($id,$interactive = true) {
// check if logged in user is either the author or owner of this item
- if((local_user() == $item['uid']) || (remote_user() == $item['contact-id'])) {
+ if((local_user() == $item['uid']) || (remote_user() == $item['contact-id']) || (! $interactive)) {
// delete the item
diff --git a/include/markdownify/markdownify.php b/include/markdownify/markdownify.php
index 7bbf1cbbe..0d4429a01 100644
--- a/include/markdownify/markdownify.php
+++ b/include/markdownify/markdownify.php
@@ -686,6 +686,10 @@ class Markdownify {
# [1]: mailto:mail@example.com Title
$tag['href'] = 'mailto:'.$bufferDecoded;
}
+
+ $this->out('['.$buffer.']('.$tag['href'].' "'.$tag['title'].'")', true);
+
+/*
# [This link][id]
foreach ($this->stack['a'] as $tag2) {
if ($tag2['href'] == $tag['href'] && $tag2['title'] === $tag['title']) {
@@ -699,6 +703,7 @@ class Markdownify {
}
$this->out('['.$buffer.']['.$tag['linkID'].']', true);
+*/
}
}
/**
@@ -737,7 +742,7 @@ class Markdownify {
// ![Alt text](/path/to/img.jpg "Optional title")
if ($this->parser->tagAttributes['title'] != "")
- $this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].'"'.$this->parser->tagAttributes['title'].'")', true);
+ $this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].' "'.$this->parser->tagAttributes['title'].'")', true);
else
$this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].')', true);
diff --git a/include/network.php b/include/network.php
index 8b26713b9..0e16f3c2d 100644
--- a/include/network.php
+++ b/include/network.php
@@ -894,7 +894,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
$s = htmlspecialchars_decode($s);
$matches = null;
- $c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
+ $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
if($c) {
require_once('include/Photo.php');
foreach($matches as $mtch) {
@@ -915,6 +915,12 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
$scaled = $mtch[1];
$i = fetch_url($scaled);
+ $cache = get_config('system','itemcache');
+ if (($cache != '') and is_dir($cache)) {
+ $cachefile = $cache."/".hash("md5", $scaled);
+ file_put_contents($cachefile, $i);
+ }
+
// guess mimetype from headers or filename
$type = guess_image_type($mtch[1],true);
@@ -940,6 +946,11 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
}
}
}
+
+ // replace the special char encoding
+
+ $s = htmlspecialchars($s,ENT_QUOTES,'UTF-8');
+
return $s;
}
diff --git a/include/zot.php b/include/zot.php
index cb57c2d84..6fe202aa8 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -58,8 +58,11 @@ function zot_verify(&$item,$identity) {
function zot_notify($entity,$url) {
- $x = z_post_url($url,
- array('zot_uid' => $entity_global_id, 'callback' => z_root() . '/zot', 'spec' => ZOT_REVISION));
+ $x = z_post_url($url, array(
+ 'zot_uid' => $entity['entity_global_id'],
+ 'callback' => z_root() . '/zot',
+ 'spec' => ZOT_REVISION)
+ );
return($x);
}
diff --git a/mod/content.php b/mod/content.php
index 6e0e318b3..dc82b2b2f 100644
--- a/mod/content.php
+++ b/mod/content.php
@@ -697,6 +697,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
'$preview' => t('Preview'),
+ '$sourceapp' => t($a->sourcename),
'$ww' => (($mode === 'network') ? $commentww : '')
));
}
diff --git a/mod/editpost.php b/mod/editpost.php
index d7b0c39da..18b41a231 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -115,8 +115,8 @@ function editpost_content(&$a) {
'$jotnets' => $jotnets,
'$title' => $itm[0]['title'],
'$placeholdertitle' => t('Set title'),
- '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
+ '$placeholdercategory' => t('Categories (comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
@@ -124,7 +124,7 @@ function editpost_content(&$a) {
'$profile_uid' => $_SESSION['uid'],
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
- '$mobileapp' => t('Friendica mobile web'),
+ '$sourceapp' => t($a->sourcename),
));
return $o;
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 5dd7de750..ea05055f0 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -176,6 +176,9 @@ function parseurl_getsiteinfo($url) {
}
} else {
$src = completeurl($siteinfo["image"], $url);
+
+ unset($siteinfo["image"]);
+
$photodata = getimagesize($src);
if (($photodata[0] > 10) and ($photodata[1] > 10))
@@ -292,8 +295,7 @@ function parse_url_content(&$a) {
$siteinfo = parseurl_getsiteinfo($url);
if($siteinfo["title"] == "") {
- echo print_r($siteinfo, true);
- //echo sprintf($template,$url,$url,'') . $str_tags;
+ echo sprintf($template,$url,$url,'') . $str_tags;
killme();
} else {
$text = $siteinfo["text"];
@@ -302,7 +304,7 @@ function parse_url_content(&$a) {
$image = "";
- if($siteinfo["image"] != ""){
+ if(sizeof($siteinfo["images"]) > 0){
/*
Execute below code only if image is present in siteinfo
*/
diff --git a/mod/photos.php b/mod/photos.php
index 0354b1941..1a8d42143 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1408,6 +1408,7 @@ function photos_content(&$a) {
'$myphoto' => $contact['thumb'],
'$comment' => t('Comment'),
'$submit' => t('Submit'),
+ '$sourceapp' => t($a->sourcename),
'$ww' => ''
));
}
diff --git a/update.php b/update.php
index 9442f825b..19e6cf3bd 100644
--- a/update.php
+++ b/update.php
@@ -1343,4 +1343,3 @@ function update_1153() {
if(!$r) return UPDATE_FAILED;
return UPDATE_SUCCESS;
}
-
diff --git a/version.inc b/version.inc
index 554d35a50..5706599cc 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-07-31.32
+2012-08-05.37
diff --git a/view/theme/darkzero/css/style.css b/view/theme/darkzero/css/style.css
index 3435deba6..e01e14252 100644
--- a/view/theme/darkzero/css/style.css
+++ b/view/theme/darkzero/css/style.css
@@ -17,7 +17,7 @@ aside{ background-image: url(../img/border.jpg); padding-bottom: 0px; }
section { background-color: #333333; background-image: url(../img/border.jpg); }
-.tabs { background-image: url(../head.jpg); }
+.tabs { background-image: url(../img/head.jpg); }
div.wall-item-content-wrapper.shiny { background-image: url('../img/shiny.png'); }
nav #banner #logo-text a { color: #ffffff; }
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 4a2a5eca6..f154bbcf1 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2549,4 +2549,9 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-} \ No newline at end of file
+}
+
+.item-image-preview {
+ float: left;
+ margin-right: 10px;
+}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 625483fe7..1e0b8b1c5 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -2906,4 +2906,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-} \ No newline at end of file
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 04:22:09 +0000