Merge branch 'master' of git://github.com/friendica/friendica-addons

This commit is contained in:
Tobias Hößl 2012-03-31 08:16:12 +00:00
commit 62022eddb9
18 changed files with 97 additions and 38 deletions

23
.gitignore vendored
View file

@ -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

Binary file not shown.

View file

@ -673,6 +673,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');
@ -793,7 +794,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)) {
@ -822,25 +823,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');
@ -1588,4 +1615,4 @@ function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0
curl_close($ch); curl_close($ch);
return($body); return($body);
}} }}

BIN
namethingy.tgz Normal file

Binary file not shown.

37
namethingy/namethingy.php Executable file
View file

@ -0,0 +1,37 @@
<?php
/**
*
* Name: NameThingy
* Description: The Ultimate Random Name Generator
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/
function namethingy_install() {
register_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
}
function namethingy_uninstall() {
unregister_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
}
function namethingy_app_menu($a,&$b) {
$b['app_menu'][] = '<div class="app-title"><a href="namethingy">NameThingy</a></div>';
}
function namethingy_module() {}
function namethingy_content(&$a) {
$baseurl = $a->get_baseurl() . '/addon/namethingy';
$o .= <<< EOT
<iframe src="http://namethingy.com" width="900" height="700" />
EOT;
return $o;
}

BIN
page.tgz

Binary file not shown.

View file

@ -44,7 +44,7 @@ function page_page_end($a,&$b) {
$page = '<div id="page-sidebar" class="widget"> $page = '<div id="page-sidebar" class="widget">
<div class="title tool"> <div class="title tool">
<h3>'.t("Community Pages").'</h3></div> <h3>'.t("Forums").'</h3></div>
<div id="sidebar-page-list"><ul>'; <div id="sidebar-page-list"><ul>';
$contacts = page_getpage($a->user['uid']); $contacts = page_getpage($a->user['uid']);

BIN
pages.tgz

Binary file not shown.

View file

@ -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'];
}
} }
?> ?>

Binary file not shown.

View file

@ -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.

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

View file

@ -11,16 +11,28 @@
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()) || (local_user() != $b['item']['uid']))
return; return;
$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']); $b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']);

Binary file not shown.

View file

@ -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');