Merge branch 'master' of git://github.com/friendika/friendika

12 files changed, 906 insertions, 79 deletions

diff --git a/README b/README
index 25fff8279..d36c37ee4 100644
--- a/README
+++ b/README
@@ -7,78 +7,143 @@
 
     http://friendika.com
 
-Did you ever wonder what might happen if you ever left Facebook? 
-
-What if there was a social network which provided some of the same interaction 
-you've grown to love, *and* was free to use, open source - and where your 
-privacy is always under your control? 
-
-And what if this social network could scale to encompass the entire internet, 
-and *not* require a central organisation to provide servers (in exchange for 
-selling your private information to advertisers)?
-
-Look no further. 
-
-Friendika is a social network without boundaries. Friendika installations can 
-link together into a global social network which is free from central 
-control. Besides the Friendika network [which is privacy enhanced]; you can 
-connect with and communicate with friends on identi.ca, Status.Net and many 
-other sites and social networks *today*. 
-
-We are currently developing connectors to seamlessly communicate with many 
+	
+    Since the dawn of the world-wide-web, the internet has been a battleground
+between the "big boys" with all their resources, and a bunch of upstarts whose
+goal is to topple the status quo - and bring the same powers of global reach 
+to anybody with a computer and an internet connection. 
+
+    The latest battleground is social networking. Many of your friends would 
+have you believe that the world (and all the information in it) belongs to 
+Facebook. 
+
+    Friendika is here to rock that boat. 
+
+    Granted, all your friends aren't here - yet. The people who made fun of you
+in high school (yet curiously wanted to be friends with you now) are still
+"poking" each other and managing their virtual farms and telling you all about
+their virtual gang wars. Would you miss them? 
+
+    I wouldn't. 
+
+    You probably have a handful of friends that are truly special. Tell those
+friends that the world has changed - because it has. It's time to move on. A 
+year ago, if you had left Facebook, there was no place to go - at least a 
+place which offered the same kind of social interaction (and wasn't just
+another huge company trying to make money off of all of your private
+information).
+
+    Today you have options.  
+
+    What if there was a social network which provided some of the same
+interaction you've grown to love, *and* was free to use, *and* was open source,
+*and* where your privacy is always under your control?
+ 
+    And what if this social network could scale to encompass the entire 
+internet, and *not* require a central organisation to provide servers (in 
+exchange for selling your private information - and everything else they can
+find out about you from logging all of your online activities and
+conversations)?
+
+    Look no further. 
+
+    Friendika is a social network without boundaries, and without ownership. 
+Friendika installations can link together into a global social network which 
+is free from central control. Besides the Friendika network (which is privacy 
+enhanced); you can also connect with and communicate with friends on identi.ca,
+Status.Net and many other sites and social networks *today*. 
+
+    Welcome to the federated social web. If you choose not to use Friendika 
+(though we think you'd be foolish not to), you can choose any of 20-30 other
+providers of federated social networking software and still be a part of this
+vast new social network. This is going to be bigger than Facebook. 
+
+    Much bigger.  
+
+    We are currently developing connectors to seamlessly communicate with many 
 other open social networks and providers - like Diaspora, GNU-Social,
 OneSocialWeb, and even some of the larger closed services such as Facebook and
 Twitter.
 
-Over the coming months, the boundaries between these networks will start to 
-become indistinguishable as they all become part of your social circle.
+    Over the coming months, the boundaries between these networks will start
+to become indistinguishable as they all become part of your social circle.
 
-Our core belief is that your personal thoughts and conversations belong to 
+   Our core belief is that your personal thoughts and conversations belong to 
 you - and are only meant to be shared with those you wish to share them with. 
 
-Period.  
-
-Friendika is secure, and as private as you wish it to be. Our privacy settings 
-are straight-forward and simple, because we know that relationships rarely are 
-(straight-forward and simple). Whether you're communicating with drinking 
-buddies or potential employers, you can rest assured that each is only able to 
-see the side of you that you wish to present. If you send a private message to 
-your aunt Mary, we will encrypt it with military grade encryption. 
-
-Other distributed social network projects talk about privacy and offering a
-feature-rich social networking alternative, but all they can deliver is vapour
-and vague promises. Friendika delivers the goods, time and time again.   
-
-A single instance of Friendika can easily support hundreds of (and up to
-several thousand) people using commodity hosting hardware. Each of these 
-people are able to connect with potentially hundreds or thousands of friends 
-and associates on any other supported network anywhere in the world and share 
-photos, links, status updates, etc. 
-
-But maybe you don't want to be connected to the world... That's OK too. 
+   Period.  
+
+   Friendika is secure, and as private as you wish it to be. Our privacy 
+settings are straight-forward and simple, because we know that relationships 
+rarely are (straight-forward and simple). Whether you're communicating with
+drinking buddies or potential employers, you can rest assured that each is
+only able to see the side of you that you wish to present. If you send a
+private message to your aunt Mary, we will encrypt it with military grade
+encryption. We also won't share it with advertisers.  
+
+    Other distributed social network projects talk about privacy and offering
+a feature-rich social networking alternative, but all they can deliver is 
+vapour and vague promises. You've probably heard about the four guys in New
+York and their "Facebook killer". What a disaster that was. Eventually they
+may get it right and release something that actually works (and lets you do 
+something besides drag your friends into categories), but they may not.
+What are you going to use in the meantime?   
+
+    Friendika delivers. We've got an incredibly rich social communications 
+interface you can make use of *right now*.
+
+    And lest you think we're just trying to copy Facebook feature-for-feature,
+you couldn't be further from the truth. We like the conversational style
+because it feels natural, and that's why Facebook grew to be what it is today. 
+But we're creating something completely different. 
+
+    Something better.
+
+    A single instance of Friendika can easily support hundreds of (and up to
+several thousand) people using commodity hosting hardware. You could even run
+Friendika on an old PC in your closet or garage. Each of these people are able
+to connect with potentially hundreds or thousands of friends and associates 
+on any other supported network anywhere in the world and share photos, links,
+status updates, etc. 
+
+    But maybe you don't want to be connected to the world... That's OK too. 
 Friendika may also be closed off from the global community and used to support
 social networking amongst corporate, educational, religious, and other private
 communities. This makes it an excellent choice for the social networking needs
 of young teenagers and especially k-12 organisations. 
 
-Every person on Friendika has unlimited profiles available to them. There is a 
-"public profile" which can be seen by anybody. Additional profiles may be 
-tailored to specific groups or individuals.
+    Every person on Friendika has unlimited profiles available to them. There
+is a "public profile" which can be seen by anybody. Additional profiles may be 
+tailored to specific groups or individuals. Try doing that on Twitter.
 
-Groups may be created and used for closed conversations. In this way your 
+    Groups may be created and used for closed conversations. In this way your 
 conversations with one group of friends is completely isolated from other 
 friends or groups of friends.
 
-You may also create interactive band/celebrity pages, special interest groups,
-and even organisational 'soapboxes' - for social communications that require
-the ability to scale to global levels. Friendika provides for automatic
+    You may also create interactive band/celebrity pages, special interest
+groups, and even organisational 'soapboxes' - for social communications that
+require the ability to scale to global levels. Friendika provides for automatic
 relationship management in these extreme cases so that you can concentrate on
 your message and public persona - and not worry about being swamped by friend
 requests. You can even maintain private social contact with your closest 
 friends and public updates to your hordes of fans - using the same interface.
 
-No other social network offers this ability.  
+    No other social network offers this ability.  
+
+
+    Join us.
+
+    *******************
+    Friendika Demo Site
+    *******************
+
+    http://demo.friendika.com
+
+    *******************
+    Friendika Downloads
+    *******************
+
+    http://github.com/friendika/friendika/tarball/master
 
-IMPORTANT: Please see the file INSTALL.txt for system requirements.
 
 
diff --git a/addon/README b/addon/README
index 18843ceab..451b6ed72 100644
--- a/addon/README
+++ b/addon/README
@@ -69,6 +69,11 @@ Current hooks:
 	$b is the item array of the information to be stored in the database
 		{Please note: body contents are bbcode - not HTML)
 
+'post_local_end' - called when a local status post or comment has been stored on the local system
+	$b is the item array of the information which has just been stored in the database
+		{Please note: body contents are bbcode - not HTML)
+
+
 'post_remote' - called when receiving a post from another source. This may also be used
 	to post local activity or system generated messages.
 	$b is the item array of information to be stored in the database and the item
diff --git a/addon/facebook/LICENSE b/addon/facebook/LICENSE
new file mode 100644
index 000000000..5193fb41f
--- /dev/null
+++ b/addon/facebook/LICENSE
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a wok means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
new file mode 100644
index 000000000..fbe4b31e6
--- /dev/null
+++ b/addon/facebook/facebook.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This module needs a lot of work.
+ *
+ * - setting/storing preferences
+ * - documentation on how to obtain FB API keys for your site 
+ * - ensuring a valid FB login session
+ * - requesting permissions within the FB login session to post on your behalf until permission revoked.
+ *
+ */
+
+
+function facebook_install() {
+	register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
+}
+
+
+function facebook_uninstall() {
+	unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
+}
+
+
+
+
+function facebook_post_hook(&$a,&$b) {
+
+	/**
+	 * Post to Facebook stream
+	 */
+
+	if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) {
+
+		$appid  = get_config('system', 'facebook_appid'  );
+		$secret = get_config('system', 'facebook_secret' );
+
+		if($appid && $secret) {
+
+			$fb_post = get_pconfig($local_user(),'facebook','post');
+
+			if($fb_post) {
+				require_once('library/facebook.php');
+				require_once('include/bbcode.php');	
+
+				$facebook = new Facebook(array(
+					'appId'  => $appid,
+					'secret' => $secret,
+					'cookie' => true
+				));			
+				try {
+					$statusUpdate = $facebook->api('/me/feed', 'post', array('message'=> bbcode($b['body']), 'cb' => ''));
+				} 
+				catch (FacebookApiException $e) {
+					notice( t('Facebook status update failed.') . EOL);
+				}
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/boot.php b/boot.php
index 6565d40bd..197b6d238 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1029   );
+define ( 'BUILD_ID',               1030   );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/database.sql b/database.sql
index bb151da27..4a8350f84 100644
--- a/database.sql
+++ b/database.sql
@@ -87,6 +87,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `pending` tinyint(1) NOT NULL DEFAULT '1',
   `rating` tinyint(1) NOT NULL DEFAULT '0',
   `reason` text NOT NULL,
+  `info` MEDIUMTEXT NOT NULL AFTER `reason`,
   `profile-id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
diff --git a/mod/contacts.php b/mod/contacts.php
index 29ef8a8cd..33d1955a5 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -65,12 +65,15 @@ function contacts_post(&$a) {
 
 	$reason = notags(trim($_POST['reason']));
 
-	$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s'
+	$info = escape_tags(trim($_POST['info']));
+
+	$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s'
 		WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($profile_id),
 		intval($priority),
 		intval($rating),
 		dbesc($reason),
+		dbesc($info),
 		intval($contact_id),
 		intval(local_user())
 	);
@@ -190,6 +193,8 @@ function contacts_content(&$a) {
 			return;
 		}
 
+		$tpl = load_view_file('view/contact_head.tpl');
+		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
 		require_once('include/contact_selectors.php');
 
@@ -239,6 +244,7 @@ function contacts_content(&$a) {
 			'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
 			'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
 			'$insecure' => (($r[0]['network'] === 'dfrn') ? '' : load_view_file('view/insecure_net.tpl')),
+			'$info' => $r[0]['info'],
 			'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
 			'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
 			'$rating' => contact_reputation($r[0]['rating']),
diff --git a/mod/item.php b/mod/item.php
index 0982bb35d..0a97cdc47 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -377,33 +377,10 @@ function item_post(&$a) {
 	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &",
 		array(),$foo));
 
-	/**
-	 * Post to Facebook stream
-	 */
+	$datarray['id'] = $post_id;
 
-	if((local_user()) && (local_user() == $profile_uid) && (! $private)) {
-		$appid  = get_config('system', 'facebook_appid'  );
-		$secret = get_config('system', 'facebook_secret' );
-		if($appid && $secret) {
-			$fb_post = get_pconfig($local_user(),'facebook','post');
-			if($fb_post) {
-				require_once('library/facebook.php');
-				require_once('include/bbcode.php');	
-
-				$facebook = new Facebook(array(
-					'appId'  => $appid,
-					'secret' => $secret,
-					'cookie' => true
-				));			
-				try {
-					$statusUpdate = $facebook->api('/me/feed', 'post', array('message'=> bbcode($datarray['body']), 'cb' => ''));
-				} 
-				catch (FacebookApiException $e) {
-					notice( t('Facebook status update failed.') . EOL);
-				}
-			}
-		}
-	}
+	call_hooks('post_local_end', $datarray);
+ 
 
 	goaway($a->get_baseurl() . "/" . $_POST['return'] );
 	return; // NOTREACHED
diff --git a/update.php b/update.php
index d6fab4255..afa3b58a4 100644
--- a/update.php
+++ b/update.php
@@ -274,3 +274,6 @@ function update_1028() {
 	q("ALTER TABLE `user` ADD `openidserver` text NOT NULL AFTER `deny_gid` ");
 }
 
+function update_1029() {
+	q("ALTER TABLE `contact` ADD `info` MEDIUMTEXT NOT NULL AFTER `reason` ");
+}
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
new file mode 100644
index 000000000..6a80c2122
--- /dev/null
+++ b/view/contact_head.tpl
@@ -0,0 +1,31 @@
+<script language="javascript" type="text/javascript"
+          src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "exact",
+	elements: "contact-edit-info",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	content_css : "bbcode.css",
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	content_css: "$baseurl/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+
diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl
index a5c8dc4ab..79a7651c1 100644
--- a/view/en/contact_edit.tpl
+++ b/view/en/contact_edit.tpl
@@ -38,6 +38,14 @@ $ignored
 <form action="contacts/$contact_id" method="post" >
 <input type="hidden" name="contact_id" value="$contact_id">
 
+<div id="contact-edit-info-wrapper">
+<h4>Contact Information / Notes</h4>
+<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
+</div>
+<div id="contact-edit-info-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+
 <div id="contact-edit-profile-select-text">
 <h4>Profile Visibility</h4>
 <p>Please choose the profile you would like to display to $name when viewing your profile securely.
diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl
index cc4db7c15..80446f044 100644
--- a/view/it/contact_edit.tpl
+++ b/view/it/contact_edit.tpl
@@ -38,6 +38,15 @@ $ignored
 <form action="contacts/$contact_id" method="post" >
 <input type="hidden" name="contact_id" value="$contact_id">
 
+<div id="contact-edit-info-wrapper">
+<h4>Informazioni di contatto / Note</h4>
+<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
+</div>
+<div id="contact-edit-info-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
+
+
 <div id="contact-edit-profile-select-text">
 <h4>Visibilt&agrave; Profiloe</h4>
 <p>Scegli il profilo che vuoi mostrare a $name quando guarda il tuo profilo in modo sicuro.</p>