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

1  2 
communityhome.tgz
ljpost.tgz
ljpost/ljpost.css
ljpost/ljpost.php

index 33c6abc12fee0a7042e3aa38e0850d9ec3f55dd9,b08abd2ec236c20a20c24d7b8083cff317798e8c..ff915f2e73f6ba36f6d56053f5a9614cef3818a9
Binary files differ
diff --cc ljpost.tgz
index f14b33d4ac398b832e02f46d3469e83ea8db5a22,0000000000000000000000000000000000000000..0132a7526e110a74659620cfb3fe1589ea418b3c
mode 100644,000000..100644
Binary files differ
index e0494c5c45599d7e32803ec45d5c771044677e17,8edab3d99e56a93f18658f9ab64a57ffedc3679e..2087d3f057a0a241c482268f9aab0d25a0aab6a8
mode 100755,100644..100755
@@@ -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
index c1b9b9758f58a2b036d239211f65c5eff679e54f,8431b134d81cba6643f9552f6b4c0f547034d7dc..16863f6757963ddf59b16f4092f51db172e3ac99
mode 100755,100644..100755
@@@ -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;