richard
/
sorbetcms
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Crop improved on API, RSS, Comments and Page Titles when long names

master
pecesama 2008-10-26 19:24:10 +00:00
parent e268a1e22a
commit b060b0becb
4 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
api.php
View File

@ -59,16 +59,16 @@ if(!defined('entry')) define('entry',true);
<posts start="<?php echo $start; ?>" total="<?php echo $total; ?>">
<?php
while($register = mysql_fetch_array($rs)) {
$desc = htmlspecialchars($register["description"]);
$url = $conf->urlGelato."/index.php?post=".$register["id_post"];
$formatedDate = gmdate("D, d M Y H:i:s", strtotime($register["date"])+transform_offset($conf->offsetTime));
$desc = trimString($register["description"]);
$strEnd = ($conf->urlFriendly) ? "/" : "";
$url = $conf->urlGelato.($conf->urlFriendly ? "/post/" : "/index.php?post=").$register["id_post"].$strEnd;
$formatedDate = gmdate("D, d M Y H:i:s", strtotime($register["date"]) + transform_offset($conf->offsetTime));
switch ($register["type"]) {
case "1":
$tit = ($register["title"]=="") ? $desc : $register["title"];
?>
$tit = (empty($register["title"])) ? $desc : strip_tags($register["title"]);
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="regular" date="<?php echo $formatedDate;?>">
<regular-title><?php echo $tit;?></regular-title>
<regular-body><?php echo $desc;?></regular-body>
@ -76,7 +76,7 @@ if(!defined('entry')) define('entry',true);
<?php
break;
case "2":
$tit = ($register["description"]=="") ? "Photo" : $desc;
$tit = (empty($register["description"])) ? "Photo" : $desc;
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="photo" date="<?php echo $formatedDate;?>">
<?php
@ -91,12 +91,12 @@ if(!defined('entry')) define('entry',true);
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="quote" date="<?php echo $formatedDate;?>">
<quote-text><?php echo $desc; ?></quote-text>
<quote-source><?php echo $register["title"]; ?></quote-source>
<quote-source><?php echo strip_tags($register["title"]); ?></quote-source>
</post>
<?php
break;
case "4":
$tit = ($register["title"]=="") ? $register["url"] : $register["title"];
$tit = (empty($register["title"])) ? $register["url"] : strip_tags($register["title"]);
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="link" date="<?php echo $formatedDate;?>">
<link-text><?php echo $tit; ?></link-text>
@ -107,7 +107,7 @@ if(!defined('entry')) define('entry',true);
case "5":
$lines = explode("\n", $desc);
$line = $lines[0];
$tit = ($register["title"]=="") ? $line : $register["title"];
$tit = (empty($register["title"])) ? trimString($line) : $register["title"];
$desc = $tumble->formatConversation($desc);
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="conversation" date="<?php echo $formatedDate;?>">
@ -118,7 +118,7 @@ if(!defined('entry')) define('entry',true);
<?php
break;
case "6":
$tit = ($register["description"]=="") ? "Video" : $desc;
$tit = (empty($register["description"])) ? "Video" : $desc;
$desc = $tumble->getVideoPlayer($register["url"]);
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="video" date="<?php echo $formatedDate;?>">
@ -130,7 +130,7 @@ if(!defined('entry')) define('entry',true);
break;
case "7":
$tit = ($register["description"]=="") ? "Audio" : $desc;
$tit = (empty($register["description"])) ? "Audio" : $desc;
$desc = $tumble->getMp3Player($register["url"]);
?>
<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="audio" date="<?php echo $formatedDate;?>">
@ -140,11 +140,8 @@ if(!defined('entry')) define('entry',true);
<?php
break;
}
$url = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
$formatedDate = gmdate("D, d M Y H:i:s", strtotime($register["date"])+transform_offset($conf->offsetTime));
}
}
}
?>
</posts>
<?php

6
classes/functions.php
View File

@ -471,4 +471,10 @@ if(!defined('entry') || !entry) die('Not a valid page');
}
return $tmpStr;
}
function trimString($string, $len = "") {
$string = strip_tags($string)
$len = (empty($len)) ? "50" : $len ;
return ( strpos($string, " ", $len) ) ? substr_replace($string, "...", $len) : $string ;
}
?>

24
index.php
View File

@ -18,7 +18,7 @@ require_once('entry.php');
global $user, $tumble, $conf;
$theme = new themes;
// My approach to MVC
// Our first approach to MVC... ¿our second? visit http://www.flavorphp.com
if(isset($_SERVER['PATH_INFO'])) $param_url = explode("/",$_SERVER['PATH_INFO']);
@ -49,7 +49,7 @@ $theme = new themes;
}
$gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
$gelato_includes .= "\t<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
$gelato_includes .= "\t<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
$gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
$gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
$gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
@ -64,11 +64,7 @@ $theme = new themes;
$register = $tumble->getPost($id_post);
if (empty($register["title"])) {
if (!empty($register["description"])) {
if (strlen($register["description"]) > $page_title_len) {
$page_title_data = substr($register["description"], 0, $page_title_len)."...";
} else {
$page_title_data = $register["description"];
}
$page_title_data = trimString($register["description"], $page_title_len);
} else {
$page_title_data = type2Text($register["type"]);
}
@ -76,7 +72,7 @@ $theme = new themes;
$page_title_data = $register["title"];
}
if (!empty($page_title_data)) {
$page_title .= $page_title_divisor.stripslashes(strip_tags($page_title_data));
$page_title .= $page_title_divisor.stripslashes($page_title_data);
}
}
@ -278,15 +274,11 @@ $theme = new themes;
$user = new user();
$username = $user->getUserByID($register["id_user"]);
$row['User'] = $username["name"];
$row["User"] = $username["name"];
if (empty($register["title"])) {
if (!empty($register["description"])) {
if (strlen($register["description"]) > 30) {
$postTitle = substr($register["description"], 0, 30)."...";
} else {
$postTitle = $register["description"];
}
$postTitle = trimString($register["description"]);
} else {
$postTitle = type2Text($register["type"]);
}
@ -294,8 +286,8 @@ $theme = new themes;
$postTitle = $register["title"];
}
$row['Post_Title'] = strip_tags($postTitle);
$row['Comments_Number'] = $comment->countComments($register["id_post"]);
$row["Post_Title"] = $postTitle;
$row["Comments_Number"] = $comment->countComments($register["id_post"]);
$rows[] = $row;
$theme->set('rows',$rows);

17
rss.php
View File

@ -20,21 +20,18 @@ if(!defined('entry')) define('entry',true);
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
?>
?>
<rss version="2.0">
<channel>
<title><?php echo htmlspecialchars($conf->title);?></title>
<link><?php echo $conf->urlGelato;?></link>
<description><?php echo htmlspecialchars($conf->description);?></description>
<generator>gelato CMS</generator>
<generator>gelato CMS <?php echo codeName()." (".version().")"; ?></generator>
<image>
<url><?php echo $conf->urlGelato;?>/images/information.png</url>
<title><?php echo htmlspecialchars($conf->description);?></title>
<link><?php echo $conf->urlGelato;?></link>
</image>
<?php
$rs = $tumble->getPosts("20");
if ($tumble->contarRegistros()>0) {
@ -77,13 +74,11 @@ if(!defined('entry')) define('entry',true);
$desc = $tumble->getMp3Player($register["url"]);
break;
}
$tit = strip_tags($tit);
//$url = htmlspecialchars($url);
$strEnd=($conf->urlFriendly) ? "/" : "";
$url = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
$formatedDate = gmdate("r", strtotime($register["date"])+transform_offset($conf->offsetTime));
$tit = trimString($tit);
$strEnd = ($conf->urlFriendly) ? "/" : "";
$url = $conf->urlGelato.($conf->urlFriendly ? "/post/" : "/index.php?post=").$register["id_post"].$strEnd;
$formatedDate = gmdate("r", strtotime($register["date"]) + transform_offset($conf->offsetTime));
?>
<item>
<title><?php echo $tit;?></title>
<description><![CDATA[<?php echo $desc;?>]]></description>