From df4f77dadddc7bd756c3e4f72fa2fbe204cfff88 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 27 Jan 2011 03:46:09 -0800
Subject: roll version - now in alpha 2.1

---
 addon/java_upload/java_upload.php | 41 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'addon/java_upload/java_upload.php')

diff --git a/addon/java_upload/java_upload.php b/addon/java_upload/java_upload.php
index 92cd5326e..3d627b08f 100644
--- a/addon/java_upload/java_upload.php
+++ b/addon/java_upload/java_upload.php
@@ -3,6 +3,47 @@
 
 
 
+function java_upload_form(&$a,&$b) {
+
+
+$b .= <<< EOT;
+
+	<div id="photos-upload-select-files-text">$filestext</div>
+
+	<div id="photos_upload_applet_wrapper">
+		<applet name="jumpLoaderApplet"
+			code="jmaster.jumploader.app.JumpLoaderApplet.class"
+			archive="$archive"
+			width="700"
+			height="600"
+			mayscript >
+			<param name="uc_uploadUrl" value="$uploadurl" />
+			<param name="uc_uploadFormName" value="photos-upload-form" />
+			<param name="gc_loggingLeveL" value="FATAL" />
+			<param name="uc_fileParameterName" value="userfile" />
+			<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
+			<param name="vc_disableLocalFileSystem" value="false" />
+			<param name="vc_uploadViewMenuBarVisible" value="false" />
+			<param name="vc_mainViewFileListViewVisible" value="true" />
+			<param name="vc_mainViewFileListViewHeightPercent" value="50" />
+			<param name="vc_mainViewFileTreeViewVisible" value="true" />
+			<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
+			<param name="vc_lookAndFeel" value="system" />
+	
+		</applet>
+		
+	</div>
+
+	<div id="photos-upload-no-java-message" >
+	$nojava
+	</div>	
+
+EOT;
+
+}
+
+
+
 
 
 function java_upload_photo_post_init(&$a,&$b) {
-- 
cgit v1.2.3


From e8a3166fa9caa1bdff90526886ae705bc44c4ac8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 27 Jan 2011 03:50:56 -0800
Subject: Revert "roll version - now in alpha 2.1"

This reverts commit df4f77dadddc7bd756c3e4f72fa2fbe204cfff88.
---
 addon/java_upload/java_upload.php | 41 ---------------------------------------
 1 file changed, 41 deletions(-)

(limited to 'addon/java_upload/java_upload.php')

diff --git a/addon/java_upload/java_upload.php b/addon/java_upload/java_upload.php
index 3d627b08f..92cd5326e 100644
--- a/addon/java_upload/java_upload.php
+++ b/addon/java_upload/java_upload.php
@@ -3,47 +3,6 @@
 
 
 
-function java_upload_form(&$a,&$b) {
-
-
-$b .= <<< EOT;
-
-	<div id="photos-upload-select-files-text">$filestext</div>
-
-	<div id="photos_upload_applet_wrapper">
-		<applet name="jumpLoaderApplet"
-			code="jmaster.jumploader.app.JumpLoaderApplet.class"
-			archive="$archive"
-			width="700"
-			height="600"
-			mayscript >
-			<param name="uc_uploadUrl" value="$uploadurl" />
-			<param name="uc_uploadFormName" value="photos-upload-form" />
-			<param name="gc_loggingLeveL" value="FATAL" />
-			<param name="uc_fileParameterName" value="userfile" />
-			<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
-			<param name="vc_disableLocalFileSystem" value="false" />
-			<param name="vc_uploadViewMenuBarVisible" value="false" />
-			<param name="vc_mainViewFileListViewVisible" value="true" />
-			<param name="vc_mainViewFileListViewHeightPercent" value="50" />
-			<param name="vc_mainViewFileTreeViewVisible" value="true" />
-			<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
-			<param name="vc_lookAndFeel" value="system" />
-	
-		</applet>
-		
-	</div>
-
-	<div id="photos-upload-no-java-message" >
-	$nojava
-	</div>	
-
-EOT;
-
-}
-
-
-
 
 
 function java_upload_photo_post_init(&$a,&$b) {
-- 
cgit v1.2.3


From 076c25e1034f35e486bf5a38c186ab897de4e3b6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 27 Jan 2011 03:52:18 -0800
Subject: Revert "Revert "roll version - now in alpha 2.1""

This reverts commit e8a3166fa9caa1bdff90526886ae705bc44c4ac8.
---
 addon/java_upload/java_upload.php | 41 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'addon/java_upload/java_upload.php')

diff --git a/addon/java_upload/java_upload.php b/addon/java_upload/java_upload.php
index 92cd5326e..3d627b08f 100644
--- a/addon/java_upload/java_upload.php
+++ b/addon/java_upload/java_upload.php
@@ -3,6 +3,47 @@
 
 
 
+function java_upload_form(&$a,&$b) {
+
+
+$b .= <<< EOT;
+
+	<div id="photos-upload-select-files-text">$filestext</div>
+
+	<div id="photos_upload_applet_wrapper">
+		<applet name="jumpLoaderApplet"
+			code="jmaster.jumploader.app.JumpLoaderApplet.class"
+			archive="$archive"
+			width="700"
+			height="600"
+			mayscript >
+			<param name="uc_uploadUrl" value="$uploadurl" />
+			<param name="uc_uploadFormName" value="photos-upload-form" />
+			<param name="gc_loggingLeveL" value="FATAL" />
+			<param name="uc_fileParameterName" value="userfile" />
+			<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
+			<param name="vc_disableLocalFileSystem" value="false" />
+			<param name="vc_uploadViewMenuBarVisible" value="false" />
+			<param name="vc_mainViewFileListViewVisible" value="true" />
+			<param name="vc_mainViewFileListViewHeightPercent" value="50" />
+			<param name="vc_mainViewFileTreeViewVisible" value="true" />
+			<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
+			<param name="vc_lookAndFeel" value="system" />
+	
+		</applet>
+		
+	</div>
+
+	<div id="photos-upload-no-java-message" >
+	$nojava
+	</div>	
+
+EOT;
+
+}
+
+
+
 
 
 function java_upload_photo_post_init(&$a,&$b) {
-- 
cgit v1.2.3


From 33037754d80dce07e6d806b6cee6df56311bb954 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 27 Jan 2011 18:45:19 -0800
Subject: removed java photo uploader from mainline. Photo uploaders are now
 plugins, but a single item upload is available by default.

---
 addon/java_upload/java_upload.php | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'addon/java_upload/java_upload.php')

diff --git a/addon/java_upload/java_upload.php b/addon/java_upload/java_upload.php
index 3d627b08f..8b8a57604 100644
--- a/addon/java_upload/java_upload.php
+++ b/addon/java_upload/java_upload.php
@@ -1,12 +1,43 @@
 <?php
 
+/**
+ *
+ * Java photo uploader, uses Jumploader
+ *
+ * WARNING: This module currently has privacy issues.
+ * The java package does not pass the permissions array intact and could lead to
+ * photos being seen by people that were excluded from seeing them.
+ *
+ */
+
+
+function java_upload_install() {
+	register_hook('photo_upload_form', 'addon/java_upload/java_upload.php', 'java_upload_form');
+	register_hook('photo_post_init',   'addon/java_upload/java_upload.php', 'java_upload_post_init');
+	register_hook('photo_post_end',    'addon/java_upload/java_upload.php', 'java_upload_post_end');
+}
+
 
+function java_upload_uninstall() {
+	unregister_hook('photo_upload_form', 'addon/java_upload/java_upload.php', 'java_upload_form');
+	unregister_hook('photo_post_init',   'addon/java_upload/java_upload.php', 'java_upload_post_init');
+	unregister_hook('photo_post_end',    'addon/java_upload/java_upload.php', 'java_upload_post_end');
+}
 
 
 function java_upload_form(&$a,&$b) {
 
+	$uploadurl = $b['post_url'];
+	$sessid = session_id();
+	$archive = $a->get_baseurl() . '/addon/java_upload/jumploader_z.jar';
+	$filestext = t('Select files to upload: ');
+
+	$nojava = t('Use the following controls only if the Java uploader [above] fails to launch.');
+
+	$b['default_upload'] = true;
+
 
-$b .= <<< EOT;
+$b['addon_text'] .= <<< EOT
 
 	<div id="photos-upload-select-files-text">$filestext</div>
 
-- 
cgit v1.2.3