jappixmini: make ready for distribution

jappixmini/MIT.txt

@@ -0,0 +1,7 @@
+You may distribute all files which are not within the jappix/ folder under the following conditions:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jappixmini/README

@@ -21,16 +21,11 @@ Limitations:
  - Jabber passwords can only be encrypted if they are at most 39 characters
    long.
 
-Installation
+Notes on the license
-------------
+--------------------
 
-Jappix Mini (AGPL license) is not distributed with this addon. You need to
+The license of this addon is AGPL, as required by Jappix Mini. If you make
-install it manually:
+modifications to the addon, you are responsible for providing a proper facility
-
+for downloading the changed source code.
-* Download latest jappix version from https://github.com/jappix/jappix/tags to
+Moreover, it may be necessary that you publish the source code of the Friendica
-  addon/jappixmini/jappix.zip. Really make sure you name it 'jappix.zip' - the
+application and all other used addons if you do not use standard versions.
-  download link required by the AGPL points there.
-* Unpack the zip file to addon/jappixmini/jappix/. Do not delete jappix.zip.
-* Delete the file addon/jappixmini/jappix/index.php. This is important, because
-  otherwise the installer of Jappix would be publicly accessible. If you are
-  lucky, the file is deleted automatically by the addon.

jappixmini/jappixmini.php

@@ -1,14 +1,19 @@
 <?php
 
-
 /**
 * Name: jappixmini
-* Description: Inserts a jabber chat
+* Description: Provides a Facebook-like chat using Jappix Mini
 * Version: 1.0
-* Author: leberwurscht
+* Author: leberwurscht <leberwurscht@hoegners.de>
 *
 */
 
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
 /*
 
 Problem:
@@ -103,29 +108,8 @@ unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_dow
 function jappixmini_plugin_admin(&$a, &$o) {
 	// display instructions and warnings on addon settings page for admin
 
-	if (!file_exists("addon/jappixmini/jappix")) {
+	if (!file_exists("addon/jappixmini.tgz")) {
-		$o .= '<p><strong>You need to install the Jappix application (see README).</strong></p>';
+		$o .= '<p><strong style="color:#fff;background-color:#f00">The source archive jappixmini.tgz does not exist. This is probably a violation of the Jappix License (AGPL).</strong></p>';
-	}
-	else if (file_exists("addon/jappixmini/jappix/index.php")) {
-		// try to delete automatically
-		try {
-			unlink("addon/jappixmini/jappix/index.php");
-		}
-		catch (Exception $e) {}
-
-		// warn admin if this is not possible
-		if (file_exists("addon/jappixmini/jappix/index.php"))
-			$o .= '<p><strong style="color:#fff;background-color:#f00">You must delete addon/jappixmini/jappix/index.php (see README).</strong></p>';
-		else {
-			info("Deleted addon/jappixmini/jappix/index.php automatically.");
-			$o .= '<p>Jappix is installed.</p>';
-		}
-	}
-	else if (!file_exists("addon/jappixmini/jappix.zip")) {
-		$o .= '<p><strong style="color:#fff;background-color:#f00">The source archive jappix.zip does not exist. This is probably a violation of the Jappix License (see README).</strong></p>';
-	}
-	else {
-		$o .= '<p>Jappix is installed.</p>';
 	}
 
 	// warn if cron job has not yet been executed
@@ -163,8 +147,6 @@ function jappixmini_init(&$a) {
 	// module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses
         // of local users
 
-	if (!file_exists("addon/jappixmini/jappix")) killme();
-
 	$dfrn_id = $_REQUEST["dfrn_id"];
 	if (!$dfrn_id) killme();
 
@@ -237,8 +219,6 @@ function jappixmini_init(&$a) {
 function jappixmini_settings(&$a, &$s) {
     // addon settings for a user
 
-    if (!file_exists("addon/jappixmini/jappix")) return;
-
     $activate = get_pconfig(local_user(),'jappixmini','activate');
     $activate = intval($activate) ? ' checked="checked"' : '';
 
@@ -364,8 +344,6 @@ function jappixmini_settings(&$a, &$s) {
 function jappixmini_settings_post(&$a,&$b) {
 	// save addon settings for a user
 
-	if (!file_exists("addon/jappixmini/jappix")) return;
-
 	if(! local_user()) return;
 	$uid = local_user();
 
@@ -414,7 +392,6 @@ function jappixmini_settings_post(&$a,&$b) {
 function jappixmini_script(&$a,&$s) {
     // adds the script to the page header which starts Jappix Mini
 
-    if (!file_exists("addon/jappixmini/jappix")) return;
     if(! local_user()) return;
 
     $activate = get_pconfig(local_user(),'jappixmini','activate');
@@ -492,8 +469,6 @@ function jappixmini_script(&$a,&$s) {
 function jappixmini_login(&$a, &$o) {
     // create client secret on login to be able to encrypt jabber passwords
 
-    if (!file_exists("addon/jappixmini/jappix")) return;
-
     // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret
     $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=datastore.js~jsjac.js"></script>'."\r\n";
 
@@ -509,8 +484,6 @@ function jappixmini_cron(&$a, $d) {
 
 	set_config("jappixmini", "last_cron_execution", $d);
 
-	if (!file_exists("addon/jappixmini/jappix")) return;
-
 	// go through list of users with jabber enabled
 	$users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'");
 	logger("jappixmini: Update list of contacts' jabber accounts for ".count($users)." users.");
@@ -604,9 +577,7 @@ function jappixmini_cron(&$a, $d) {
 function jappixmini_download_source(&$a,&$b) {
 	// Jappix Mini source download link on About page
 
-	if (!file_exists("addon/jappixmini/jappix")) return;
-
 	$b .= '<h1>Jappix Mini</h1>';
-	$b .= '<p>This site uses Jappix Mini by the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/AUTHORS">Jappix authors</a>, which is distributed under the terms of the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
+	$b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
-	$b .= '<p>You can download the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix.zip">source code</a>.</p>';
+	$b .= '<p>You can download the <a href="'.$a->get_baseurl().'/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a></p>';
 }

jappixmini/lib.js

@@ -1,3 +1,9 @@
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
 function jappixmini_addon_xor(str1, str2) {
     if (str1.length != str2.length) throw "not same length";
 

jappixmini/proxy.php

@@ -7,7 +7,7 @@ This is a PHP BOSH proxy
 
 -------------------------------------------------
 
-License: MIT
+This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
 Authors: Vanaryon, Leberwurscht
 
 */