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

Merge pull request #912 from annando/master

Browse source 
More compatible "Vier", more speed and problems with some parsed characters
This commit is contained in:
tobiasd 2014-02-17 08:00:21 +01:00
commit 623bf1c4d1
5 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/network.php
View file

@ -575,6 +575,10 @@ function network_content(&$a, $update = 0) {
//$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : ''); //$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
$sql_nets = (($nets) ? sprintf(" and `item`.`network` = '%s' ", dbesc($nets)) : ''); $sql_nets = (($nets) ? sprintf(" and `item`.`network` = '%s' ", dbesc($nets)) : '');
if ($star OR $bmark) {
$sql_table = "`item` INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options and deleted = 0 ORDER BY `commented` DESC) AS `temp1` ON item.parent = `temp1`.parent ";
$sql_extra = "";
} else
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) "; $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
if($group) { if($group) {

12
mod/parse_url.php
View file

@ -327,12 +327,14 @@ function parse_url_content(&$a) {
if($url && $title && $text) { if($url && $title && $text) {
$title = str_replace(array("\r","\n"),array('',''),$title);
if($textmode) if($textmode)
$text = '[quote]' . trim($text) . '[/quote]' . $br; $text = '[quote]' . trim($text) . '[/quote]' . $br;
else else {
$text = '<blockquote>' . trim($text) . '</blockquote><br />'; $text = '<blockquote>' . htmlspecialchars(trim($text)) . '</blockquote><br />';
$title = htmlspecialchars($title);
$title = str_replace(array("\r","\n"),array('',''),$title); }
$result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags;
@ -381,7 +383,7 @@ function parse_url_content(&$a) {
if($textmode) if($textmode)
$text = '[quote]'.trim($text).'[/quote]'; $text = '[quote]'.trim($text).'[/quote]';
else else
$text = '<blockquote>'.trim($text).'</blockquote>'; $text = '<blockquote>'.htmlspecialchars(trim($text)).'</blockquote>';
} }
if($image) { if($image) {

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

@ -887,6 +887,7 @@ aside {
line-height: 17px; line-height: 17px;
position: fixed; position: fixed;
/* overflow: auto; */ /* overflow: auto; */
height: 100%;
height: calc(100% - 42px); height: calc(100% - 42px);
/* overflow: scroll; */ /* overflow: scroll; */
box-shadow: 1px 1px 6px -3px #666; box-shadow: 1px 1px 6px -3px #666;
@ -1102,7 +1103,7 @@ section {
border-right: 1px solid lightgray; border-right: 1px solid lightgray;
border-left: 1px solid lightgray; */ border-left: 1px solid lightgray; */
position: absolute; position: absolute;
/*left: 215px;*/ left: 215px;
left: calc(215px + (100% - (215px + 766px)) / 6); left: calc(215px + (100% - (215px + 766px)) / 6);
/* left: calc(215px + (100% - 215px) / 10); */ /* left: calc(215px + (100% - 215px) / 10); */
} }
@ -1125,7 +1126,7 @@ border-bottom: 1px solid #D2D2D2;
} }
.wall-item-decor { .wall-item-decor {
position: absolute; position: absolute;
/* left: 755px; */ left: 755px;
left: calc(100% - 7px); left: calc(100% - 7px);
/* top: -10px; */ /* top: -10px; */
width: 16px; width: 16px;
@ -1135,7 +1136,7 @@ border-bottom: 1px solid #D2D2D2;
} }
.wall-item-container { .wall-item-container {
display: table; display: table;
/* width: 745px; */ width: 745px;
width: calc(100% - 10px); width: calc(100% - 10px);
} }
@ -1351,7 +1352,7 @@ border-bottom: 1px solid #D2D2D2;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 80px; margin-left: 80px;
/* width: 665px; */ width: 665px;
width: calc(100% - 90px); width: calc(100% - 90px);
border-bottom: 1px solid hsl(198, 21%, 79%); border-bottom: 1px solid hsl(198, 21%, 79%);
} }
@ -1410,7 +1411,8 @@ border-bottom: 1px solid #D2D2D2;
} }
.comment-edit-preview { .comment-edit-preview {
width: 660px; /* width: 660px; */
width: 100%;
border: 1px solid #2d2d2d; border: 1px solid #2d2d2d;
margin-top: 10px; margin-top: 10px;
top: 15px !important; top: 15px !important;
@ -1420,10 +1422,12 @@ border-bottom: 1px solid #D2D2D2;
padding-left: 12px; padding-left: 12px;
} }
.comment-edit-preview .wall-item-container { .comment-edit-preview .wall-item-container {
width: 700px; /* width: 700px; */
width: 100%;
} }
.comment-edit-preview .tread-wrapper { .comment-edit-preview .tread-wrapper {
width: 700px; /* width: 700px; */
width: 100%;
padding: 0; padding: 0;
margin: 10px 0; margin: 10px 0;
border-bottom: 0px; border-bottom: 0px;
@ -1480,7 +1484,7 @@ border-bottom: 1px solid #D2D2D2;
#profile-jot-form #profile-jot-text { #profile-jot-form #profile-jot-text {
height: 2.0em; height: 2.0em;
/* width: 99%; */ /* width: 99%; */
/* width: 752px; */ width: 752px;
width: calc(100% - 10px); width: calc(100% - 10px);
font-size: 15px; font-size: 15px;
color: #999999; color: #999999;