]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge https://github.com/tonybaldwin/friendica-addons into apull
authorfriendica <info@friendica.com>
Sat, 3 Mar 2012 00:44:30 +0000 (16:44 -0800)
committerfriendica <info@friendica.com>
Sat, 3 Mar 2012 00:44:30 +0000 (16:44 -0800)
resolved several conflicts and mibbit was not removed
Conflicts:
ljpost/ljpost.css
ljpost/ljpost.php

15 files changed:
blockem.tgz
blockem/blockem.php
communityhome.tgz
communityhome/twillingham/README [new file with mode: 0644]
communityhome/twillingham/communityhome.php [new file with mode: 0644]
ljpost.tar.gz [deleted file]
ljpost.tgz [new file with mode: 0644]
ljpost/ljpost.css [changed mode: 0644->0755]
ljpost/ljpost.php [changed mode: 0644->0755]
mibbit.tar.gz [deleted file]
mibbit/mibbit.php [deleted file]
qcomment.tgz
qcomment/qcomment.php
wppost.tgz
wppost/wppost.php

index 129a00652b979469e08b86f9fdb187bcb24c817a..ec7119f832cece136f5a921df77962c2c4a3f473 100755 (executable)
Binary files a/blockem.tgz and b/blockem.tgz differ
index 43f34554e24071cc92a492c2121a4b8d244f8632..9134bd0b654fea63fdfaeba3bd3fc01a4d4c4a08 100755 (executable)
@@ -101,15 +101,15 @@ function blockem_prepare_body(&$a,&$b) {
                }
        }
        if($found) {
-               $rnd = random_string(8);        
+               $rnd = random_string(8);
                $b['html'] = '<div id="blockem-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'blockem-' . $rnd . '\'); >' . sprintf( t('Blocked %s - Click to open/close'),$word ) . '</div><div id="blockem-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';  
        }
 }
 
 
 function blockem_display_item(&$a,&$b) {
-       if(strstr($b['output'],'id="blockem-wrap-'))
-               $b['output'] = preg_replace('/\<img(.*?)src=\"(.*?)\" class=\"wall\-item\-photo(.*?)\>/','<img$1src="' . $a->get_baseurl() . "/images/default-profile-sm.jpg" . '" class="wall-item-photo$3>',$b['output']);
+       if(strstr($b['output']['body'],'id="blockem-wrap-'))
+               $b['output']['thumb'] = $a->get_baseurl() . "/images/default-profile-sm.jpg";
 }
 
 
@@ -193,4 +193,4 @@ function blockem_init(&$a) {
        set_pconfig(local_user(),'blockem','words',$words);
        info( t('blockem settings updated') . EOL );
        killme();
-}
\ No newline at end of file
+}
index b08abd2ec236c20a20c24d7b8083cff317798e8c..ff915f2e73f6ba36f6d56053f5a9614cef3818a9 100755 (executable)
Binary files a/communityhome.tgz and b/communityhome.tgz differ
diff --git a/communityhome/twillingham/README b/communityhome/twillingham/README
new file mode 100644 (file)
index 0000000..bb57427
--- /dev/null
@@ -0,0 +1,7 @@
+Thomas Willingham
+
+This isn't even close to being worth a pull request, but some people might find it useful.
+
+Enable community home in your admin panel, then replace communityhome.php with this one to get a front page like mine (a normal front page, but with latest users shown in the sidebar, which looks bleak when there's nothing in it).
+
+There are more graceful ways of doing this, I used communityhome as I plan to make use of a limited stream and likes in future.
diff --git a/communityhome/twillingham/communityhome.php b/communityhome/twillingham/communityhome.php
new file mode 100644 (file)
index 0000000..102732a
--- /dev/null
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Name: Community home
+ * Description: Show last community activity in homepage
+ * Version: 1.0
+ * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ */
+
+
+require_once('mod/community.php');
+
+
+function communityhome_install() {
+       register_hook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home');
+       logger("installed communityhome");
+}
+
+function communityhome_uninstall() {
+       unregister_hook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home');
+       logger("removed communityhome");
+}
+
+function communityhome_home(&$a, &$o){
+       // custom css
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/communityhome/communityhome.css" media="all" />';
+       
+       $aside = array(
+               '$tab_1' => t('Login'),
+               '$tab_2' => t('OpenID'),
+               '$noOid' => get_config('system','no_openid'),
+       );
+       
+       // login form
+       $aside['$login_title'] =  t('Login');
+       $aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
+       
+       // last 12 users
+       $aside['$lastusers_title'] = t('Latest users');
+       $aside['$lastusers_items'] = array();
+       $sql_extra = "";
+       $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
+       $order = " ORDER BY `register_date` DESC ";
+
+       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+                       FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
+                       WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+               0,
+               12
+       );
+       $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+       if(count($r)) {
+               $photo = 'thumb';
+               foreach($r as $rr) {
+                       $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                       $entry = replace_macros($tpl,array(
+                               '$id' => $rr['id'],
+                               '$profile-link' => $profile_link,
+                               '$photo' => $rr[$photo],
+                               '$alt-text' => $rr['name'],
+                       ));
+                       $aside['$lastusers_items'][] = $entry;
+               }
+       }
+       
+       // 12 most active users (by posts and contacts)
+       // this query don't work on some mysql versions
+       $r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`  FROM
+                       (SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
+                       (SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
+                       (
+                       SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` 
+                       UNION ALL 
+                       SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid`
+                       ) AS `uni`, `user`, `profile`
+                       WHERE `uni`.`uid`=`user`.`uid`
+                       AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1
+                       GROUP BY `uid`
+                       ORDER BY `items` DESC,`contacts` DESC
+                       LIMIT 0,10");
+       if($r && count($r)) {
+               $aside['$activeusers_title']  = t('Most active users');
+               $aside['$activeusers_items']  = array();
+               
+               $photo = 'thumb';
+               foreach($r as $rr) {
+                       $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                       $entry = replace_macros($tpl,array(
+                               '$id' => $rr['id'],
+                               '$profile-link' => $profile_link,
+                               '$photo' => $rr[$photo],
+                               '$alt-text' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0'))
+                       ));
+                       $aside['$activeusers_items'][] = $entry;
+               }
+       }
+       
+       
+       
+       
+       $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+       $a->page['aside'] = replace_macros($tpl, $aside);
+       $o = '';
+       if(file_exists('home.html'))
+       
+               $o .= file_get_contents('home.html');
+       
+}
diff --git a/ljpost.tar.gz b/ljpost.tar.gz
deleted file mode 100644 (file)
index b3f354f..0000000
Binary files a/ljpost.tar.gz and /dev/null differ
diff --git a/ljpost.tgz b/ljpost.tgz
new file mode 100644 (file)
index 0000000..0132a75
Binary files /dev/null and b/ljpost.tgz differ
old mode 100644 (file)
new mode 100755 (executable)
index 8edab3d..2087d3f
@@ -1,5 +1,21 @@
 
 #ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
+<<<<<<< HEAD
+       float: left;
+       width: 200px;
+       margin-top: 10px;
+}
+
+#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
+       float: left;
+       margin-top: 10px;
+}
+
+#ljpost-submit {
+       margin-top: 15px;
+}
+
+=======
 float: left;
 width: 200px;
 margin-top: 10px;
@@ -12,4 +28,5 @@ margin-top: 10px;
 
 #ljpost-submit {
 margin-top: 15px;
-}
\ No newline at end of file
+}
+>>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4
old mode 100644 (file)
new mode 100755 (executable)
index 8431b13..16863f6
@@ -161,16 +161,22 @@ function ljpost_send(&$a,&$b) {
        if($x && strlen($x[0]['timezone']))
                $tz = $x[0]['timezone'];        
 
-       $lj_username = get_pconfig($b['uid'],'ljpost','lj_username');
-       $lj_password = get_pconfig($b['uid'],'ljpost','lj_password');
-       $lj_blog = 'http://www.livejournal.com/interface/xmlrpc';
+       $lj_username = xmlify(get_pconfig($b['uid'],'ljpost','lj_username'));
+       $lj_password = xmlify(get_pconfig($b['uid'],'ljpost','lj_password'));
+       $lj_journal = xmlify(get_pconfig($b['uid'],'ljpost','lj_journal'));
+//     if(! $lj_journal)
+//             $lj_journal = $lj_username;
+
+       $lj_blog = xmlify(get_pconfig($b['uid'],'ljpost','lj_blog'));
+       if(! strlen($lj_blog))
+               $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
 
        if($lj_username && $lj_password && $lj_blog) {
 
                require_once('include/bbcode.php');
                require_once('include/datetime.php');
 
-               $title = $b['title'];
+               $title = xmlify($b['title']);
                $post = bbcode($b['body']);
                $post = xmlify($post);
 
@@ -183,28 +189,36 @@ function ljpost_send(&$a,&$b) {
 
                $xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
-<methodCall><methodName>LJ.XMLRPC.postevent</methodName>
-<params><param>
-<value><struct>
-<member><name>year</name><value><int>$year</int></value></member>
-<member><name>mon</name><value><int>$mon</int></value></member>
-<member><name>day</name><value><int>$day</int></value></member>
-<member><name>hour</name><value><int>$hour</int></value></member>
-<member><name>min</name><value><int>$min</int></value></member>
-<member><name>usejournal</name><value><string>$lj_username</string></value></member>
-<member><name>event</name><value><string>$post</string></value></member>
-<member><name>username</name><value><string>$lj_username</string></value></member>
-<member><name>password</name><value><string>$lj_password</string></value></member>
-<member><name>subject</name><value><string>$title</string></value></member>
-<member><name>lineendings</name><value><string>unix</string></value></member>
-<member><name>ver</name><value><int>1</int></value></member>
-<member><name>props</name>
-<value><struct>
-<member><name>useragent</name><value><string>Friendica</string></value></member>
-<member><name>taglist</name><value><string>friendica</string></value></member>
-</struct></value></member>
-</struct></value>
-</param></params>
+<methodCall>
+  <methodName>LJ.XMLRPC.postevent</methodName>
+  <params>
+    <param><value>
+        <struct>
+        <member><name>username</name><value><string>$lj_username</string></value></member>
+        <member><name>password</name><value><string>$lj_password</string></value></member>
+        <member><name>event</name><value><string>$post</string></value></member>
+        <member><name>subject</name><value><string>$title</string></value></member>
+        <member><name>lineendings</name><value><string>unix</string></value></member>
+        <member><name>year</name><value><int>$year</int></value></member>
+        <member><name>mon</name><value><int>$mon</int></value></member>
+        <member><name>day</name><value><int>$day</int></value></member>
+        <member><name>hour</name><value><int>$hour</int></value></member>
+        <member><name>min</name><value><int>$min</int></value></member>
+               <member><name>usejournal</name><value><string>$lj_username</string></value></member>
+               <member>
+                       <name>props</name>
+                       <value>
+                               <struct>
+                                       <member>
+                                               <name>useragent</name>
+                                               <value><string>Friendica</string></value>
+                                       </member>
+                               </struct>
+                       </value>
+               </member>
+        </struct>
+    </value></param>
+  </params>
 </methodCall>
 
 EOT;
diff --git a/mibbit.tar.gz b/mibbit.tar.gz
deleted file mode 100644 (file)
index 6b0a386..0000000
Binary files a/mibbit.tar.gz and /dev/null differ
diff --git a/mibbit/mibbit.php b/mibbit/mibbit.php
deleted file mode 100755 (executable)
index 90f322c..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Name: Mibbit Chat Plugin
- * Description: add a mibbit/irc chatroom
- * Version: 1.0
- * Author: tony baldwin <http://tonybaldwin.me>
- */
-
-
-function mibbit_install() {
-       register_hook('app_menu', 'addon/mibbit/mibbit.php', 'mibbit_app_menu');
-}
-
-function mibbit_uninstall() {
-       unregister_hook('app_menu', 'addon/mibbit/mibbit.php', 'mibbit_app_menu');
-
-}
-
-function mibbit_app_menu($a,&$b) {
-       $b['app_menu'][] = '<div class="app-title"><a href="mibbit">' . t('Mibbit IRC Chatroom') . '</a></div>'; 
-}
-
-
-function mibbit_module() {
-       return;
-}
-
-
-
-
-
-function mibbit_content(&$a) {
-
-       $baseurl = $a->get_baseurl() . '/addon/mibbit';
-       $o = '';
-
-// this stuff is supposed to go in the page header
-
-$a->page['htmlhead'] .= 'session_start();  
- $nick   = empty($_SESSION[\'user_name\']) ? \'Wdg\' : $_SESSION[\'user_name\'];
- $server = \"irc.mibbit.net\"; // default: 
- $room   = \"friendica\"; // w/o # or %23 !
- $uri = \"https://widget.mibbit.com/\" .
- \"?nick=$nick_%3F%3F\" . // each %3F(=?) will be replaced by a random digit 
- \"&customprompt=Welcome%20to%20$server/$room\" .
- \"&customloading=maybe%20you%20need%20to%20close%20other%20Mibbit%20windows%20first...\" .
- \"&settings=c76462e5055bace06e32d325963b39f2\"; // etc.
- if (!empty($room))    {$uri .= \'&channel=%23\' . $room;}  
- if (!empty($server )) {$uri .= \'&server=\'     . $server;}'
- // add the chatroom frame and some html
-    $o .= '<h2>chat</h2>';
-    $o .= '<center>';
-    $o .= '<iframe  src=\"<?PHP echo $uri; ?>\" frameborder=\"0\">
- [Your user agent does not support frames or is currently configured
- not to display frames. However, you may want to open the
- <A href=\"<?PHP echo $uri; ?>\" target=\"_blank\"> chat in a new browser window ...</A>]';
-    $o .= '</iframe>';
-    $o .= '<br>(no spaces, interpunctuation or leading ciphers in your /nick name)';
-    $o .= '<h4>type /help to learn about special commands</h4>';
-    $o .= '</center><hr>'
-    
-}
index 76dffda1c46b5eac43e558fa50e9ffa378a801e4..1ab55a43f8d3a0cc5b146950d35c7a65b5211726 100644 (file)
Binary files a/qcomment.tgz and b/qcomment.tgz differ
index 45e6332ef3603f5a0da6b74fe3da26608d9a5175..6b37257995412748a71daf5548a6dafdef912b6c 100755 (executable)
@@ -53,6 +53,7 @@ function qcomment_addon_settings(&$a,&$s) {
     $s .= '<div class="settings-block">';
     $s .= '<h3>' . t('Quick Comment Settings') . '</h3>';
     $s .= '<div id="qcomment-wrapper">';
+       $s .= '<div id="qcomment-desc">' . t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
     $s .= '<label id="qcomment-label" for="qcomment-words">' . t('Enter quick comments, one per line') . ' </label>';
     $s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
     $s .= '</div><div class="clear"></div>';
index 6dad5c117973a78a07fc7ea29a3b82d21bed43aa..12f96d3b0c569d433447d2fb11310e8ef953834f 100755 (executable)
Binary files a/wppost.tgz and b/wppost.tgz differ
index 5c1482e7864c46f07e69db795ae1d703eddd4b88..264a342c0c0733c5934b218bb0f9646984e3257b 100755 (executable)
@@ -161,8 +161,8 @@ function wppost_send(&$a,&$b) {
         return;
 
 
-       $wp_username = get_pconfig($b['uid'],'wppost','wp_username');
-       $wp_password = get_pconfig($b['uid'],'wppost','wp_password');
+       $wp_username = xmlify(get_pconfig($b['uid'],'wppost','wp_username'));
+       $wp_password = xmlify(get_pconfig($b['uid'],'wppost','wp_password'));
        $wp_blog = get_pconfig($b['uid'],'wppost','wp_blog');
 
        if($wp_username && $wp_password && $wp_blog) {
@@ -174,8 +174,7 @@ function wppost_send(&$a,&$b) {
                $post = xmlify($post);
 
                $xml = <<< EOT
-
-<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <methodCall>
   <methodName>blogger.newPost</methodName>
   <params>
@@ -194,7 +193,7 @@ EOT;
 
                if($wp_blog !== 'test')
                        $x = post_url($wp_blog,$xml);
-               logger('posted to wordpress: ' . ($x) ? $x : '');
+               logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 
        }
 }