keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #850 from annando/master

Browse source 
New style for shared links. Preparation for changes in some addons
This commit is contained in:
tobiasd 2013-12-08 23:15:07 -08:00
commit c56e0ab0cc
6 changed files with 55 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/bbcode.php
View file

@ -23,7 +23,7 @@ function cleancss($input) {
if (($char >= "a") and ($char <= "z"))
$cleaned .= $char;
if (!(strpos(" #;:0123456789", $char) === false))
if (!(strpos(" #;:0123456789-_", $char) === false))
$cleaned .= $char;
}

6
include/text.php
View file

@ -278,6 +278,12 @@ function paginate_data(&$a, $count=null) {
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];
if (!strstr($stripped, "?")) {
$pos = strpos($stripped, "&");
$stripped = substr($stripped, 0, $pos)."?".substr($stripped, $pos + 1);
}
$url = $a->get_baseurl() . '/' . $stripped;

2
index.php
View file

@ -471,7 +471,7 @@ if ($_GET["mode"] == "raw") {
foreach ($_GET AS $param => $value)
if (($param != "page") AND ($param != "q"))
$reload_uri .= "&".$param."=".$value;
$reload_uri .= "&".$param."=".urlencode($value);
$a->page['htmlhead'] .= <<< EOT
<script type="text/javascript">

13
mod/parse_url.php
View file

@ -75,6 +75,19 @@ function parseurl_getsiteinfo($url, $no_guessing = false) {
return($siteinfo);
}
require_once("include/oembed.php");
$oembed_data = oembed_fetch_url($url);
if ($oembed_data->type == "link") {
if (isset($oembed_data->title))
$siteinfo["title"] = $oembed_data->title;
if (isset($oembed_data->description))
$siteinfo["text"] = $oembed_data->description;
if (isset($oembed_data->thumbnail_url))
$siteinfo["image"] = $oembed_data->thumbnail_url;
}
// Fetch the first mentioned charset. Can be in body or header
if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches))
$charset = trim(array_pop($matches));

25
view/theme/vier/style.css
View file

@ -479,6 +479,11 @@ div.jGrowl div.info {
color: #ffffff;
padding-left: 58px;
}
div.jGrowl div.jGrowl-notification {
margin-top: 40px;
}
/* header */
header {
position: fixed;
@ -1161,6 +1166,21 @@ border-bottom: 1px solid #D2D2D2;
font-size: 12px;
}
.wall-item-container .wall-item-content .type-link img,
.type-link img {
max-width: 160px;
max-height: 160px;
float: left;
margin-right: 10px;
}
.type-link blockquote {
margin-left: 160px;
max-height: 160px;
overflow: hidden;
}
.type-link .oembed {
}
.wall-item-container .wall-item-content {
font-size: 14px;
max-width: 660px;
@ -1659,22 +1679,27 @@ border-bottom: 1px solid #D2D2D2;
#profile-link-wrapper {
float: left;
margin-left: 15px;
cursor: pointer;
}
#profile-video-wrapper {
float: left;
margin-left: 15px;
cursor: pointer;
}
#profile-audio-wrapper {
float: left;
margin-left: 15px;
cursor: pointer;
}
#profile-location-wrapper {
float: left;
margin-left: 15px;
cursor: pointer;
}
#profile-nolocation-wrapper {
float: left;
margin-left: 15px;
cursor: pointer;
}
#jot-perms-icon {
float: right;