diff --git a/js/main.js b/js/main.js index 7a90fa9106..ac238bf6aa 100644 --- a/js/main.js +++ b/js/main.js @@ -17,6 +17,7 @@ } + var src = null; var prev = null; var livetime = null; @@ -558,12 +559,36 @@ function notifyMarkAll() { } +// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser +function fcFileBrowser (field_name, url, type, win) { + /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry + the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5"). + These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */ + + + var cmsURL = baseurl+"/fbrowser/"+type+"/"; + + tinyMCE.activeEditor.windowManager.open({ + file : cmsURL, + title : 'File Browser', + width : 420, // Your dimensions may differ - toy around with them! + height : 400, + resizable : "yes", + inline : "yes", // This parameter only has an effect if you use the inlinepopups plugin! + close_previous : "no" + }, { + window : win, + input : field_name + }); + return false; + } + function setupFieldRichtext(){ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: "fieldRichtext", - plugins : "bbcode,paste", + plugins : "bbcode,paste, inlinepopups", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", @@ -580,6 +605,7 @@ function setupFieldRichtext(){ convert_urls: false, content_css: baseurl+"/view/custom_tinymce.css", theme_advanced_path : false, + file_browser_callback : "fcFileBrowser", }); } diff --git a/mod/fbrowser.php b/mod/fbrowser.php new file mode 100644 index 0000000000..66ff9252eb --- /dev/null +++ b/mod/fbrowser.php @@ -0,0 +1,99 @@ + + */ + +/** + * @param App $a + */ +function fbrowser_content($a){ + + if (!local_user()) + killme(); + + if ($a->argc==1) + killme(); + + //echo "
"; var_dump($a->argv); killme();	
+	
+	switch($a->argv[1]){
+		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())
+				);
+				// 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);
+				
+			}
+			
+			$album = "";
+			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
+					GROUP BY `resource-id` $sql_extra2",
+				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){
+				$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 "
"; 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();
+	
+}
diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl
new file mode 100644
index 0000000000..1e97237f47
--- /dev/null
+++ b/view/filebrowser.tpl
@@ -0,0 +1,84 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	

+		
    
+			
  • FileBrowser
    • 
+		

+	

+	

+
+		

+			

+				{{ for $path as $p }}$p.1{{ endfor }}
+			

+			

+				
    
+					{{ for $folders as $f }}
  • $f.1
    • {{ endfor }}
+				

+			

+			

+				
    
+				{{ for $files as $f }}
+					
  • $f.1
    • 
+				{{ endfor }}
+				

+			

+		

+	

+	

+		
+	
	
+	
+	
+
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 67e5eb6810..f1c283470b 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -26,7 +26,7 @@ function initEditor(cb){
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
 			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 			theme_advanced_buttons2 : "",
 			theme_advanced_buttons3 : "",
@@ -44,6 +44,7 @@ function initEditor(cb){
 			convert_urls: false,
 			content_css: "$baseurl/view/custom_tinymce.css",
 			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
 			setup : function(ed) {
 				cPopup = null;
 				ed.onKeyDown.add(function(ed,e) {