diff options
Diffstat (limited to 'data/templates/default')
| -rw-r--r-- | data/templates/default/bookmarklet.inc.php | 8 | ||||
| -rw-r--r-- | data/templates/default/bookmarks-thumbnail.inc.tpl.php | 2 | ||||
| -rw-r--r-- | data/templates/default/importDelicious.tpl.php | 2 | ||||
| -rw-r--r-- | data/templates/default/rss.tpl.php | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/data/templates/default/bookmarklet.inc.php b/data/templates/default/bookmarklet.inc.php index 9867745..c93f581 100644 --- a/data/templates/default/bookmarklet.inc.php +++ b/data/templates/default/bookmarklet.inc.php @@ -45,7 +45,7 @@ if (browser == "Opera") { + '<?php $popupLink = 'javascript:' . "location.href='" - . createURL('bookmarks', $GLOBALS['user']) + . addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])) . '?action=add' . "&address='+encodeURIComponent(document.location.href)+'" . "&title='+encodeURIComponent(document.title)+'" @@ -71,7 +71,7 @@ echo jsEscTitle(htmlspecialchars($link)); + '<?php $popupLink = 'javascript:' . 'open(' - . "'" . createURL('bookmarks', $GLOBALS['user']) + . "'" . addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])) . '?action=add' . '&popup=1' . "&address='+encodeURIComponent(document.location.href)+'" @@ -97,7 +97,7 @@ echo jsEscTitle(htmlspecialchars($link)); } else { $('#bookmarklet').append( '<ul>' - + '<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&address=\'+a+\'&title=\'+t+\'&description=\'+d;void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>' + + '<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])); ?>?action=add&address=\'+a+\'&title=\'+t+\'&description=\'+d;void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>' + '<li>' + '<a class="bookmarklet" href="' + 'javascript:x=document;' @@ -105,7 +105,7 @@ echo jsEscTitle(htmlspecialchars($link)); + 't=encodeURIComponent(x.title);' + 'd=encodeURIComponent('+selection+');' + 'open(' - + '\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&popup=1&address=\'+a+\'&title=\'+t+\'&description=\'+d,\'<?php echo htmlspecialchars(jsEscTitleDouble($GLOBALS['sitename'])); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2' + + '\'<?php echo addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])); ?>?action=add&popup=1&address=\'+a+\'&title=\'+t+\'&description=\'+d,\'<?php echo htmlspecialchars(jsEscTitleDouble($GLOBALS['sitename'])); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2' + ');void 0;">' + '<?php echo jsEscTitle(sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename'])); ?>' + '</a>' diff --git a/data/templates/default/bookmarks-thumbnail.inc.tpl.php b/data/templates/default/bookmarks-thumbnail.inc.tpl.php index 200b8f7..77cc67f 100644 --- a/data/templates/default/bookmarks-thumbnail.inc.tpl.php +++ b/data/templates/default/bookmarks-thumbnail.inc.tpl.php @@ -13,6 +13,6 @@ $thumbnailHash = md5( $address . $GLOBALS['thumbnailsUserId'] . $GLOBALS['thumbnailsKey'] ); //echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; -echo '<img class="thumbnail" onclick="window.location.href=\''.$address.'\'" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; +echo '<img class="thumbnail" onclick="window.location.href=\''.htmlspecialchars($address).'\'" src="http://www.artviper.net/screenshots/screener.php?url='.htmlspecialchars($address).'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; ?>
\ No newline at end of file diff --git a/data/templates/default/importDelicious.tpl.php b/data/templates/default/importDelicious.tpl.php index bc4d892..0f53cde 100644 --- a/data/templates/default/importDelicious.tpl.php +++ b/data/templates/default/importDelicious.tpl.php @@ -30,7 +30,7 @@ $this->includeTemplate($GLOBALS['top_include']); <h3><?php echo T_('Instructions'); ?></h3> <ol> - <li><?php echo T_('Log in to the <a href="http://del.icio.us/api/posts/all">export page at del.icio.us</a>'); ?>.</li> + <li><?php echo T_('Log in to the <a href="https://api.del.icio.us/v1/posts/all">export page at del.icio.us</a>'); ?>.</li> <li><?php echo T_('Save the resulting <abbr title="Extensible Markup Language">XML</abbr> file to your computer'); ?>.</li> <li><?php echo T_('Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB'); ?>.</li> <li><?php echo T_('Select the default privacy setting for your imported bookmarks'); ?>.</li> diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php index 6be5425..4aba277 100644 --- a/data/templates/default/rss.tpl.php +++ b/data/templates/default/rss.tpl.php @@ -1,10 +1,13 @@ <?php echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; ?> -<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:atom="http://www.w3.org/2005/Atom" +> <channel> <title><?php echo $feedtitle; ?></title> - <link><?php echo htmlspecialchars($feedlink); ?></link> + <link><?php echo htmlspecialchars($pagelink); ?></link> + <atom:link rel="self" type="application/rss+xml" href="<?php echo htmlspecialchars($feedlink); ?>"/> <description><?php echo htmlspecialchars($feeddescription); ?></description> <pubDate><?php echo date('r'); ?></pubDate> <lastBuildDate><?php echo $feedlastupdate ?></lastBuildDate> @@ -14,6 +17,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; <item> <title><?php echo htmlspecialchars($bookmark['title']); ?></title> <link><?php echo htmlspecialchars($bookmark['link']); ?></link> + <guid><?php echo $bookmark['guid']; ?></guid> <description><?php echo htmlspecialchars($bookmark['description']); ?></description> <dc:creator><?php echo htmlspecialchars($bookmark['creator']); ?></dc:creator> <pubDate><?php echo $bookmark['pubdate']; ?></pubDate> |