From e2e6b56c448da3a67fa25df118bbb7cbc3239664 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 18 Apr 2012 13:23:42 +0200
Subject: tinymce: add filebrowser for photos and attached files

---
 mod/fbrowser.php | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 mod/fbrowser.php

(limited to 'mod')

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
new file mode 100644
index 000000000..44e21cbfa
--- /dev/null
+++ b/mod/fbrowser.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @package		Friendica\modules
+ * @subpackage	FileBrowser
+ * @author		Fabio Comuni <fabrixxm@kirgroup.com>
+ */
+ 
+/**
+ * @param App $a
+ */
+function fbrowser_content($a){
+	
+	if (!local_user())
+		killme();
+
+	if ($a->argc==1)
+		killme();
+	
+	//echo "<pre>"; var_dump($a->argv); killme();	
+	
+	switch($a->argv[1]){
+		case "image":
+			if ($a->argc==2){
+				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
+					intval(local_user())
+				);
+				// anon functions only from 5.3.0... meglio tardi che mai..
+				function folder1($el){return array(bin2hex($el['album']),$el['album']);}	
+				$albums = array_map( "folder1" , $albums);
+				
+				$tpl = get_markup_template("filebrowser.tpl");
+				echo replace_macros($tpl, array(
+					'$type' => 'image',
+					'$baseurl' => $a->get_baseurl(),
+					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Photos"))),
+					'$folders' => $albums,
+					'$files' =>false,					
+				));
+				
+			}
+			
+			if ($a->argc==3){
+				$album = hex2bin($a->argv[2]);
+				$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `scale`, `desc`  FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+					AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
+					intval(local_user()),
+					dbesc($album)
+				);
+				
+				
+				function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg');  }
+				$files = array_map("files1", $r);
+				
+				$tpl = get_markup_template("filebrowser.tpl");
+				echo replace_macros($tpl, array(
+					'$type' => 'image',
+					'$baseurl' => $a->get_baseurl(),
+					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")),
+									array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album)),
+					'$folders' => false,
+					'$files' =>$files,
+				));
+				
+				
+				
+			}
+			break;
+		case "file":
+			if ($a->argc==2){
+				$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
+					intval(local_user())
+				);
+				
+				function files2($rr){ global $a; 
+					list($m1,$m2) = explode("/",$rr['filetype']);
+					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+					return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
+				}
+				$files = array_map("files2", $files);
+				//echo "<pre>"; var_dump($files); killme();
+			
+							
+				$tpl = get_markup_template("filebrowser.tpl");
+				echo replace_macros($tpl, array(
+					'$type' => 'file',
+					'$baseurl' => $a->get_baseurl(),
+					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
+					'$folders' => false,
+					'$files' =>$files,
+				));
+				
+			}
+		
+			break;
+	}
+	
+
+	killme();
+	
+}
-- 
cgit v1.2.3


From 063012045563f7c41663e0da5eba24a4191d36d0 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 18 Apr 2012 14:56:03 +0200
Subject: filebrowser: more style, load min and max scale photos

---
 mod/fbrowser.php | 52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

(limited to 'mod')

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 44e21cbfa..33695b30f 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -20,6 +20,8 @@ function fbrowser_content($a){
 	
 	switch($a->argv[1]){
 		case "image":
+			$path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
+			$albums = false;
 			if ($a->argc==2){
 				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
 					intval(local_user())
@@ -28,42 +30,34 @@ function fbrowser_content($a){
 				function folder1($el){return array(bin2hex($el['album']),$el['album']);}	
 				$albums = array_map( "folder1" , $albums);
 				
-				$tpl = get_markup_template("filebrowser.tpl");
-				echo replace_macros($tpl, array(
-					'$type' => 'image',
-					'$baseurl' => $a->get_baseurl(),
-					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Photos"))),
-					'$folders' => $albums,
-					'$files' =>false,					
-				));
-				
 			}
 			
+			$album = "";
 			if ($a->argc==3){
 				$album = hex2bin($a->argv[2]);
-				$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `scale`, `desc`  FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
-					AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
-					intval(local_user()),
-					dbesc($album)
-				);
-				
-				
-				function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg');  }
-				$files = array_map("files1", $r);
-				
-				$tpl = get_markup_template("filebrowser.tpl");
-				echo replace_macros($tpl, array(
-					'$type' => 'image',
-					'$baseurl' => $a->get_baseurl(),
-					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")),
-									array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album)),
-					'$folders' => false,
-					'$files' =>$files,
-				));
+				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+				$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
+			}
 				
+			$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  FROM `photo` WHERE `uid` = %d $sql_extra
+				AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
+				intval(local_user())					
+			);
+			
+			
+			function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg');  }
+			$files = array_map("files1", $r);
+			
+			$tpl = get_markup_template("filebrowser.tpl");
+			echo replace_macros($tpl, array(
+				'$type' => 'image',
+				'$baseurl' => $a->get_baseurl(),
+				'$path' => $path,
+				'$folders' => $albums,
+				'$files' =>$files,
+			));
 				
 				
-			}
 			break;
 		case "file":
 			if ($a->argc==2){
-- 
cgit v1.2.3


From fddf21d983e97b489c26dba95aa35227b15fe9f3 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 18 Apr 2012 15:15:52 +0200
Subject: filebrowser: fix style, show 10 recent photos if not in an album

---
 mod/fbrowser.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'mod')

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 33695b30f..66ff9252e 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -22,6 +22,9 @@ function fbrowser_content($a){
 		case "image":
 			$path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
 			$albums = false;
+			$sql_extra = "";
+			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
+			
 			if ($a->argc==2){
 				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
 					intval(local_user())
@@ -36,11 +39,13 @@ function fbrowser_content($a){
 			if ($a->argc==3){
 				$album = hex2bin($a->argv[2]);
 				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+				$sql_extra2 = "";
 				$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
 			}
 				
-			$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  FROM `photo` WHERE `uid` = %d $sql_extra
-				AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
+			$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
+					FROM `photo` WHERE `uid` = %d $sql_extra
+					GROUP BY `resource-id` $sql_extra2",
 				intval(local_user())					
 			);
 			
-- 
cgit v1.2.3