From: friendica <info@friendica.com>
Date: Sat, 3 Mar 2012 00:44:30 +0000 (-0800)
Subject: Merge https://github.com/tonybaldwin/friendica-addons into apull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ab2c715a4001e9aebbc1db70b5fcac7e61f463f;p=friendica-addons.git

Merge https://github.com/tonybaldwin/friendica-addons into apull
resolved several conflicts and mibbit was not removed
Conflicts:
	ljpost/ljpost.css
	ljpost/ljpost.php
---

7ab2c715a4001e9aebbc1db70b5fcac7e61f463f
diff --cc communityhome.tgz
index 33c6abc1,b08abd2e..ff915f2e
Binary files differ
diff --cc ljpost.tgz
index f14b33d4,00000000..0132a752
mode 100644,000000..100644
Binary files differ
diff --cc ljpost/ljpost.css
index e0494c5c,8edab3d9..2087d3f0
mode 100755,100644..100755
--- a/ljpost/ljpost.css
+++ b/ljpost/ljpost.css
@@@ -1,16 -1,15 +1,32 @@@
  
  #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;
+ }
+ 
+ #ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
+ float: left;
+ margin-top: 10px;
+ }
+ 
+ #ljpost-submit {
+ margin-top: 15px;
 -}
++}
++>>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4
diff --cc ljpost/ljpost.php
index c1b9b975,8431b134..16863f67
mode 100755,100644..100755
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@@ -189,24 -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;