mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-08-19 08:10:51 +00:00
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: viewsrc: show message source in a fancybox via ajax Fixed typo in smiley name. deleted: .gitignore On second thoughts, better leave that to Mike since I don't really know what I'm doing Update .gitignore Facebook: detecting of images when exporting Pages: Moved under Networks Show more: Changed "Show More" to "show more" rembemberoid: save openid url in cookie on user request and use it to automatically login widgets: only local user can change settings * master:
This commit is contained in:
commit
beffd91100
9 changed files with 102 additions and 36 deletions
23
.gitignore
vendored
23
.gitignore
vendored
|
@ -1,23 +0,0 @@
|
||||||
favicon.*
|
|
||||||
.htconfig.php
|
|
||||||
\#*
|
|
||||||
include/jquery-1.4.2.min.js
|
|
||||||
*.log
|
|
||||||
*.out
|
|
||||||
*.version*
|
|
||||||
#favicon.*
|
|
||||||
#home.html
|
|
||||||
#addon
|
|
||||||
*~
|
|
||||||
|
|
||||||
#ignore documentation, it should be newly built
|
|
||||||
#doc/api
|
|
||||||
|
|
||||||
#ignore reports, should be generted with every build
|
|
||||||
report/
|
|
||||||
|
|
||||||
#ignore config files from eclipse, we don't want IDE files in our repository
|
|
||||||
.project
|
|
||||||
.buildpath
|
|
||||||
.externalToolBuilders
|
|
||||||
.settings
|
|
|
@ -672,6 +672,7 @@ function facebook_post_hook(&$a,&$b) {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
|
require_once('include/html2plain.php');
|
||||||
|
|
||||||
logger('Facebook post');
|
logger('Facebook post');
|
||||||
|
|
||||||
|
@ -792,7 +793,7 @@ function facebook_post_hook(&$a,&$b) {
|
||||||
if($b['verb'] == ACTIVITY_DISLIKE)
|
if($b['verb'] == ACTIVITY_DISLIKE)
|
||||||
$msg = trim(strip_tags(bbcode($msg)));
|
$msg = trim(strip_tags(bbcode($msg)));
|
||||||
|
|
||||||
$search_str = $a->get_baseurl() . '/search';
|
/*$search_str = $a->get_baseurl() . '/search';
|
||||||
|
|
||||||
if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
|
if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
|
||||||
|
|
||||||
|
@ -821,25 +822,51 @@ function facebook_post_hook(&$a,&$b) {
|
||||||
if((strpos($link,z_root()) !== false) && (! $image))
|
if((strpos($link,z_root()) !== false) && (! $image))
|
||||||
$image = $a->get_baseurl() . '/images/friendica-64.jpg';
|
$image = $a->get_baseurl() . '/images/friendica-64.jpg';
|
||||||
|
|
||||||
$msg = trim(strip_tags(bbcode($msg)));
|
$msg = trim(strip_tags(bbcode($msg)));*/
|
||||||
|
|
||||||
|
// Test
|
||||||
|
|
||||||
|
// Looking for images
|
||||||
|
if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
|
||||||
|
$image = $matches[3];
|
||||||
|
|
||||||
|
if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
|
||||||
|
$image = $matches[1];
|
||||||
|
|
||||||
|
$html = bbcode($b['body']);
|
||||||
|
$msg = trim($b['title']." \n".html2plain($html, 0, true));
|
||||||
$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
|
$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
|
||||||
|
|
||||||
|
$toolong = false;
|
||||||
|
|
||||||
// add any attachments as text urls
|
// add any attachments as text urls
|
||||||
|
|
||||||
$arr = explode(',',$b['attach']);
|
$arr = explode(',',$b['attach']);
|
||||||
|
|
||||||
if(count($arr)) {
|
if(count($arr)) {
|
||||||
$msg .= "\n";
|
$msg .= "\n";
|
||||||
foreach($arr as $r) {
|
foreach($arr as $r) {
|
||||||
$matches = false;
|
$matches = false;
|
||||||
$cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
|
$cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
|
||||||
if($cnt) {
|
if($cnt) {
|
||||||
$msg .= $matches[1];
|
$msg .= "\n".$matches[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen($msg) > FACEBOOK_MAXPOSTLEN) {
|
// To-Do: look for bookmark-bbcode and handle it with priority
|
||||||
|
|
||||||
|
$links = collecturls($html);
|
||||||
|
if (sizeof($links) > 0) {
|
||||||
|
reset($links);
|
||||||
|
$link = current($links);
|
||||||
|
/*if (strlen($msg."\n".$link) <= FACEBOOK_MAXPOSTLEN)
|
||||||
|
$msg .= "\n".$link;
|
||||||
|
else
|
||||||
|
$toolong = true;*/
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((strlen($msg) > FACEBOOK_MAXPOSTLEN) or $toolong) {
|
||||||
$shortlink = "";
|
$shortlink = "";
|
||||||
require_once('library/slinky.php');
|
require_once('library/slinky.php');
|
||||||
|
|
||||||
|
@ -1586,4 +1613,4 @@ function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0
|
||||||
|
|
||||||
curl_close($ch);
|
curl_close($ch);
|
||||||
return($body);
|
return($body);
|
||||||
}}
|
}}
|
||||||
|
|
|
@ -82,7 +82,12 @@ function pages_page_end($a,&$b) {
|
||||||
$contact["Name"]."</a></li>";
|
$contact["Name"]."</a></li>";
|
||||||
}
|
}
|
||||||
$pages .= "</ul></div></div>";
|
$pages .= "</ul></div></div>";
|
||||||
if (sizeof($contacts) > 0)
|
if (sizeof($contacts) > 0) {
|
||||||
$a->page['aside'] = $pages.$a->page['aside'];
|
$pos = strpos($a->page['aside'], '<div id="saved-search-list"');
|
||||||
|
if ($pos > 0) {
|
||||||
|
$a->page['aside'] = substr($a->page['aside'], 0, $pos).$pages.substr($a->page['aside'], $pos);
|
||||||
|
} else
|
||||||
|
$a->page['aside'] = $pages.$a->page['aside'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
44
rememberoid/rememberoid.php
Normal file
44
rememberoid/rememberoid.php
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Name: Remember OpenID Login
|
||||||
|
* Description: Autologin with last openid used
|
||||||
|
* Version: 1.0
|
||||||
|
* Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
function rememberoid_install(){
|
||||||
|
register_hook('init_1','addon/rememberoid/rememberoid.php','rememberoid_init');
|
||||||
|
register_hook('logging_out','addon/rememberoid/rememberoid.php','rememberoid_logout');
|
||||||
|
register_hook('login_hook','addon/rememberoid/rememberoid.php','rememberoid_form');
|
||||||
|
}
|
||||||
|
|
||||||
|
function rememberoid_uninstall(){
|
||||||
|
unregister_hook('init_1','addon/rememberoid/rememberoid.php','rememberoid_init');
|
||||||
|
unregister_hook('logging_out','addon/rememberoid/rememberoid.php','rememberoid_logout');
|
||||||
|
unregister_hook('login_hook','addon/rememberoid/rememberoid.php','rememberoid_form');
|
||||||
|
}
|
||||||
|
|
||||||
|
function rememberoid_init(&$a) {
|
||||||
|
if (x($_COOKIE, "remember_oid") && !x($_SESSION['openid']) && !x($_SESSION,'authenticated') && !x($_POST,'auth-params') && $a->module === 'home' ){
|
||||||
|
$_POST['openid_url'] = $_COOKIE["remember_oid"];
|
||||||
|
$_POST['auth-params'] = 1;
|
||||||
|
}
|
||||||
|
if (x($_POST,'auth-params') && $_POST['openid_url'] && $_POST['openid_url']!="" && $_POST['remember_oid']){
|
||||||
|
setcookie('remember_oid', $_POST['openid_url'], time()+60*60*24*30, "/");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function rememberoid_logout(&$a) {
|
||||||
|
setcookie("rembember_oid", "", time()-3600);
|
||||||
|
}
|
||||||
|
|
||||||
|
function rememberoid_form(&$a, &$o){
|
||||||
|
$tpl = get_markup_template("field_checkbox.tpl");
|
||||||
|
$html = replace_macros($tpl, array(
|
||||||
|
'$field' => array('remember_oid', t("Autologin with this OpenId"), false,''),
|
||||||
|
));
|
||||||
|
|
||||||
|
$o = preg_replace("|<div *id=[\"']login_openid[\"']>|", "<div id='login_openid'>".$html, $o);
|
||||||
|
|
||||||
|
}
|
|
@ -83,7 +83,7 @@ function showmore_prepare_body(&$a,&$b) {
|
||||||
if($found) {
|
if($found) {
|
||||||
$rnd = random_string(8);
|
$rnd = random_string(8);
|
||||||
$b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ".
|
$b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ".
|
||||||
'<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('Show More')).'</span></span>'.
|
'<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
|
||||||
'<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
|
'<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
BIN
smiley_pack/icons/disgust/fartblush.gif
Normal file
BIN
smiley_pack/icons/disgust/fartblush.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
|
@ -11,13 +11,25 @@
|
||||||
|
|
||||||
function viewsrc_install() {
|
function viewsrc_install() {
|
||||||
register_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
|
register_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
|
||||||
|
register_hook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function viewsrc_uninstall() {
|
function viewsrc_uninstall() {
|
||||||
unregister_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
|
unregister_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
|
||||||
|
unregister_hook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function viewsrc_page_end(&$a, &$o){
|
||||||
|
$a->page['htmlhead'] .= <<< EOS
|
||||||
|
<script>
|
||||||
|
$(function(){
|
||||||
|
$('a[href*="/viewsrc/"]').fancybox();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
EOS;
|
||||||
|
}
|
||||||
|
|
||||||
function viewsrc_item_photo_menu(&$a,&$b) {
|
function viewsrc_item_photo_menu(&$a,&$b) {
|
||||||
if(! local_user())
|
if(! local_user())
|
||||||
|
|
|
@ -19,7 +19,8 @@ function widgets_uninstall() {
|
||||||
|
|
||||||
|
|
||||||
function widgets_settings_post(){
|
function widgets_settings_post(){
|
||||||
|
if(! local_user())
|
||||||
|
return;
|
||||||
if (isset($_POST['widgets-submit'])){
|
if (isset($_POST['widgets-submit'])){
|
||||||
del_pconfig(local_user(), 'widgets', 'key');
|
del_pconfig(local_user(), 'widgets', 'key');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue