diff --git a/.gitignore b/.gitignore deleted file mode 100755 index 88dec63d..00000000 --- a/.gitignore +++ /dev/null @@ -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 diff --git a/facebook/facebook.php b/facebook/facebook.php index 24632240..20690edd 100755 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -672,6 +672,7 @@ function facebook_post_hook(&$a,&$b) { */ require_once('include/group.php'); + require_once('include/html2plain.php'); logger('Facebook post'); @@ -792,7 +793,7 @@ function facebook_post_hook(&$a,&$b) { if($b['verb'] == ACTIVITY_DISLIKE) $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)) { @@ -821,25 +822,51 @@ function facebook_post_hook(&$a,&$b) { if((strpos($link,z_root()) !== false) && (! $image)) $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'); + $toolong = false; + // add any attachments as text urls - $arr = explode(',',$b['attach']); + $arr = explode(',',$b['attach']); - if(count($arr)) { + if(count($arr)) { $msg .= "\n"; - foreach($arr as $r) { - $matches = false; + foreach($arr as $r) { + $matches = false; $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); 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 = ""; require_once('library/slinky.php'); @@ -1586,4 +1613,4 @@ function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0 curl_close($ch); return($body); -}} \ No newline at end of file +}} diff --git a/pages/pages.php b/pages/pages.php index bc56d2e4..d0cdc589 100755 --- a/pages/pages.php +++ b/pages/pages.php @@ -82,7 +82,12 @@ function pages_page_end($a,&$b) { $contact["Name"].""; } $pages .= ""; - if (sizeof($contacts) > 0) - $a->page['aside'] = $pages.$a->page['aside']; + if (sizeof($contacts) > 0) { + $pos = strpos($a->page['aside'], '
0) { + $a->page['aside'] = substr($a->page['aside'], 0, $pos).$pages.substr($a->page['aside'], $pos); + } else + $a->page['aside'] = $pages.$a->page['aside']; + } } ?> diff --git a/rememberoid/rememberoid.php b/rememberoid/rememberoid.php new file mode 100644 index 00000000..36f42c36 --- /dev/null +++ b/rememberoid/rememberoid.php @@ -0,0 +1,44 @@ + + */ + + +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("|
|", "
".$html, $o); + +} diff --git a/showmore/showmore.php b/showmore/showmore.php index 7842a58e..6aeb6ff3 100755 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -83,7 +83,7 @@ function showmore_prepare_body(&$a,&$b) { if($found) { $rnd = random_string(8); $b['html'] = ''.$shortened." ". - ''.sprintf(t('Show More')).''. + ''.sprintf(t('show more')).''. ''; } } diff --git a/smiley_pack/.smiley_pack.php.kate-swp b/smiley_pack/.smiley_pack.php.kate-swp deleted file mode 100644 index 73a77b3a..00000000 Binary files a/smiley_pack/.smiley_pack.php.kate-swp and /dev/null differ diff --git a/smiley_pack/icons/disgust/fartblush.gif b/smiley_pack/icons/disgust/fartblush.gif new file mode 100644 index 00000000..4160a1fc Binary files /dev/null and b/smiley_pack/icons/disgust/fartblush.gif differ diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php index e39fe8a6..a610b76c 100644 --- a/viewsrc/viewsrc.php +++ b/viewsrc/viewsrc.php @@ -11,13 +11,25 @@ function viewsrc_install() { 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() { 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 + +EOS; +} function viewsrc_item_photo_menu(&$a,&$b) { if(! local_user()) diff --git a/widgets/widgets.php b/widgets/widgets.php index 27cabfd6..47a6e48a 100755 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -19,7 +19,8 @@ function widgets_uninstall() { function widgets_settings_post(){ - + if(! local_user()) + return; if (isset($_POST['widgets-submit'])){ del_pconfig(local_user(), 'widgets', 'key');