Simplified path configuration

Author: Offerel

CHANGELOG.md

@@ -1,10 +1,11 @@
 ### v2.0.6
-- Removed fontawesome
+- Added contextmenu
 - Updated easyMDE to v2.14.0
 - Updated tagify to v3.22.3
-- Added contextmenu
 - Fixed tag tooltips
 - Fixed error message with empty noteslist
+- Removed fontawesome
+- Simplified path configuration
 
 ### v2.0.5
 - Added function to change YAML metadata

config.inc.php.dist

@@ -1,11 +1,8 @@
 <?php
-$config['notes_basepath'] = '/path/to/server/folder/'; // absolute base! path where your notes are stored
-$config['notes_folder'] = '/files/Notes/'; // notes folder under basepath. in the end the folder is calculated by 'basepath' + 'username' + 'notes_folder'
+$config['notes_path'] = '/path/to/server/folder/%u/files/Notes'; // path to your notes, use %u for username
 $config['media_folder'] = '.media';  // folder to store embedded images or binary file like *.pdf
 $config['default_format'] = 'md'; // default format, you can choose between 'md' or 'txt'
 $config['list_formats'] = ['md', 'txt']; // list of displayed formats, can be a combination of md, html, txt, pdf, jpg, png
 $config['yaml_support'] = true;  // set to true, if you want enable yaml support
-$config['yaml_start'] = '---';  // the yaml header should starts as the first sign in a markdown note and is marked by default with '---'
-$config['yaml_end'] = '---';  // the signs which marks the end of the yaml header
-$config['rm_md_media'] = true;  // if set to yes, embedded media will be removed
+$config['rm_md_media'] = false;  // if set to yes, embedded media will be removed
 ?>

notes.php

@@ -12,27 +12,21 @@
 $rcmail = rcmail::get_instance();
 
 if (!empty($rcmail->user->ID)) {
-	if(substr($rcmail->config->get('notes_basepath', false), -1) != '/') {
-		error_log('PrimitiveNotes: check $config[\'notes_basepath\'] the path must end with a backslash.');
-		die();
-	}
-	
-	if(substr($rcmail->config->get('notes_folder', false), -1) != '/') {
-		error_log('PrimitiveNotes: check $config[\'notes_folder\'] the path must end with a backslash.');
-		die();
-	}
-	
-	$notes_path = $rcmail->config->get('notes_basepath', false).$rcmail->user->get_username().$rcmail->config->get('notes_folder', false);
+	$notes_path = $rcmail->config->get('notes_path', false);
+	$notes_path = (strpos($notes_path, '%u') === false) ? $notes_path:str_replace('%u', $rcmail->user->get_username(), $notes_path);
+	$notes_path = ($notes_path[-1] != '/') ? $notes_path.'/':$notes_path;
+
 	$media_folder = $rcmail->config->get('media_folder', false);
+	$media_folder = ($media_folder[-1] != '/') ? $media_folder.'/':$media_folder;
 	setcookie('pn_', json_encode($media_folder), 0, parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH), '.'.$_SERVER['HTTP_HOST'], true);
 	$default_format = $rcmail->config->get('default_format', false);
 	$language = $rcmail->get_user_language();
-	$yh_begin = $rcmail->config->get('yaml_start', '');
-	$yh_end = $rcmail->config->get('yaml_end', '');
+	$yh_begin = '---';
+	$yh_end = '---';
 
 	if (!is_dir($notes_path)) {
 		if(!mkdir($notes_path, 0774, true)) {
-			error_log('PrimitiveNotes: Subfolders for $config[\'notes_basepath\'] ($config[\'notes_folder\']) failed. Please check your directory permissions.');
+			error_log('PrimitiveNotes: Check notes folder ($config[\'notes_path\']) failed. Please check directory permissions.');
 			die();
 		}
 	}
@@ -58,7 +52,7 @@
 if($_FILES['localFile'] && $_FILES['localFile']['error'] == 0 ) {
 	if (!is_dir($notes_path.$media_folder)) {
 		if(!mkdir($notes_path.$media_folder, 0774, true)) {
-			error_log('PrimitiveNotes: Subfolders for $config[\'notes_basepath\'] ($config[\'notes_folder\']) (media) failed. Please check your directory permissions.');
+			error_log('PrimitiveNotes: Check media folder ($config[\'media_folder\']) failed. Please check directory permissions.');
 			die();
 		}
 	}
@@ -230,7 +224,6 @@
 				$tags_str = ($tags_str != "") ? "[".$tags_str."]" : $tags_str;
 				$new_name = $note_name.$tags_str.".".$note_type;
 			}
-			$notes_path = $rcmail->config->get('notes_basepath', false).$rcmail->user->get_username().$rcmail->config->get('notes_folder', false);
 
 			if(file_exists($notes_path.$old_name) && $old_name != '') {
 				if($old_name != $new_name) if(!rename($notes_path.$old_name, $notes_path.$new_name)) die('Could not rename file.');
@@ -276,7 +269,8 @@
 			break;
 		case 'delMedia':
 			$files = json_decode($_POST['files']);
-			$mpath = $notes_path = $rcmail->config->get('notes_basepath', false).$rcmail->user->get_username().$rcmail->config->get('notes_folder', false).$rcmail->config->get('media_folder', false);
+			$mpath = $notes_path.$rcmail->config->get('media_folder', false);
+			$mpath = ($mpath[-1] != '/') ? $mpath.'/':$mpath;
 			foreach($files as $key => $file) {
 				$rfile = filter_var($file, FILTER_SANITIZE_STRING);
 				$rfile = $mpath.$rfile;
@@ -295,7 +289,7 @@
 			$img = $notes_path.$media_folder.$fname;
 			if (!is_dir($notes_path.$media_folder)) {
 				if(!mkdir($notes_path.$media_folder, 0774, true)) {
-					error_log('PrimitiveNotes: Subfolders for $config[\'notes_basepath\'] ($config[\'notes_folder\']) (media) failed. Please check your directory permissions.');
+					error_log('PrimitiveNotes: Check media folders failed. Please check your directory permissions.');
 					die();
 				}
 			}

primitivenotes.php

@@ -114,7 +114,10 @@ function note_mail_compose($args) {
 				$subject = substr($subject,0,47)."...";
 			}
 		}
-		$note_file = $rcmail->config->get('notes_basepath', false).$rcmail->user->get_username().$rcmail->config->get('notes_folder', false).$filename;
+		$notes_path = $rcmail->config->get('notes_path', false);
+		$notes_path = (strpos($notes_path, '%u') === false) ? $notes_path:str_replace('%u', $rcmail->user->get_username(), $notes_path);
+		$notes_path = ($notes_path[-1] != '/') ? $notes_path.'/':$notes_path;
+		$note_file = $notes_path.$filename;
 		if(file_exists($note_file)) {
 			$handle = fopen ($note_file, "r");
 			$note_content = fread($handle, filesize($note_file));
@@ -152,7 +155,10 @@ function action() {
         	'tablink' => array($this, 'tablink'),
         ));
 
-		$rcmail->output->set_env('npath', $rcmail->config->get('notes_basepath', false).$rcmail->user->get_username().$rcmail->config->get('notes_folder', false));
+		$notes_path = $rcmail->config->get('notes_path', false);
+		$notes_path = (strpos($notes_path, '%u') === false) ? $notes_path:str_replace('%u', $rcmail->user->get_username(), $notes_path);
+		$notes_path = ($notes_path[-1] != '/') ? $notes_path.'/':$notes_path;
+		$rcmail->output->set_env('npath', $notes_path);
 		$rcmail->output->set_env('dformat', $rcmail->config->get('default_format', false));
 		$rcmail->output->add_handlers(array('notescontent' => array($this, 'content'),));
 		$rcmail->output->set_pagetitle($this->gettext('notes'));

skins/larry/templates/template.html

@@ -12,29 +12,14 @@
 	<span class="dropbutton">
 		<roundcube:button id="newnote" command="newnote" type="link" class="button new" label="primitivenotes.note_new" title="primitivenotes.note_new" />
 		<a href="#new-note" class="dropbuttontip" id="newmenulink" onclick="UI.toggle_popup('newmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="newmenu-menu" tabindex="0"><roundcube:label name="primitivenotes.arialabelnewoptions" /></a>
-	</span>	
+	</span>
+	<span id="nmenu">
 		<roundcube:button id="editnote" command="editnote" type="link" class="button edit disabled" label="primitivenotes.note_edit" title="primitivenotes.note_edit" />
 		<roundcube:button id="deletenote" command="deletenote" type="link" class="button delete disabled" label="primitivenotes.note_del" title="primitivenotes.note_del" />
 		<roundcube:button id="sendnote" command="sendnote" type="link" class="button send disabled" label="primitivenotes.note_send" title="primitivenotes.note_send" />
+	</span>
 		<roundcube:button id="addnote" command="addnote" type="link" class="button upload" label="primitivenotes.note_upload" title="primitivenotes.note_upload" />
 		<form id="upl_form" method="POST" enctype="multipart/form-data"><input name="path" value="<roundcube:var name="env:npath" />" type="hidden" /><input type="file" id="upl" class="upl" name="files" onchange="javascript:sform(this.value);" /></form>
-		<script>
-		function sform(fileName) {
-			var allowed_extensions = new Array('html', 'pdf', 'jpg', 'png', 'md', 'txt');
-			var file_extension = fileName.split('.').pop().toLowerCase(); 
-
-			for(var i = 0; i <= allowed_extensions.length; i++)
-			{
-				if(allowed_extensions[i]==file_extension)
-				{
-					document.getElementById("upl_form").submit();
-					return true;
-				}
-			}
-			alert('<roundcube:label name="primitivenotes.note_inv_format" />');
-			return false;
-		}
-		</script>
 	</div>
 	<div id="pluginbody" class="offset">
 		<div class="iframebox simplenotes_<roundcube:var name='env:action' />">
@@ -44,7 +29,6 @@
 </div>
 <div id="newmenu" class="popupmenu" aria-hidden="true">
 	<ul id="newmenu-menu" class="toolbarmenu" role="menu">
-		<roundcube:button type="link-menuitem" command="htmlnote" class="menuentry" label="primitivenotes.note_formathtml" prop="html" />
 		<roundcube:button type="link-menuitem" command="mdnote" class="menuentry" label="primitivenotes.note_formatmd" prop="md" />
 		<roundcube:button type="link-menuitem" command="txtnote" class="menuentry" label="primitivenotes.note_formattxt" prop="txt" />
 		<roundcube:container name="newmenu" id="newmenu-menu" />