Revert "Try to add option to remove media"

Offerel · Offerel · commit 9e292b88375b · 2021-01-22T12:33:09.000+01:00
This reverts commit f5cd5e2.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,3 @@
-### v1.5.9
-- Try to add option to remove media
-  
 ### v1.5.8
 - Changed Markdown Editor to [EasyMD v2.13.0](https://github.com/ionaru/easy-markdown-editor)
 - Removed rarely used code styles
diff --git a/config.inc.php.dist b/config.inc.php.dist
@@ -6,5 +6,4 @@ $config['default_format'] = 'md'; // default format, you can choose between 'htm
 $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'] = false;  // if set to yes, embedded media will be removed
 ?>
diff --git a/localization/de_DE.inc b/localization/de_DE.inc
@@ -18,5 +18,4 @@ $labels['note_formattxt'] = 'Normaler Text';
 $labels['ariallabelnewoptions'] = 'Optionen';
 $labels['note_defaultformat'] = 'Standard Format';
 $labels['note_yamls'] = 'Aktiviere YAML';
-$labels['note_rmedia_md'] = 'Lösche automatisch eingbettete Medien mit Markdown Files';
 ?>
diff --git a/localization/en_US.inc b/localization/en_US.inc
@@ -18,5 +18,4 @@ $labels['note_formattxt'] = 'Pure Text';
 $labels['ariallabelnewoptions'] = 'Options';
 $labels['note_defaultformat'] = 'Default Format';
 $labels['note_yamls'] = 'Enable YAML';
-$labels['note_rmedia_md'] = 'Remove automatically embedded Media with Markdown Files';
 ?>
diff --git a/localization/es_AR.inc b/localization/es_AR.inc
@@ -18,5 +18,4 @@ $labels['note_formattxt'] = 'Texto Plano';
 $labels['ariallabelnewoptions'] = 'Opciones';
 $labels['note_defaultformat'] = 'Formato estándar';
 $labels['note_yamls'] = 'Activa YAML';
-$labels['note_rmedia_md'] = 'Elimina automáticamente los medios incrustados con Markdown Files';
 ?>
diff --git a/localization/pt_BR.inc b/localization/pt_BR.inc
@@ -16,5 +16,4 @@ $labels['note_formathtml'] = 'HTML';
 $labels['note_formatmd'] = 'Remarcar';
 $labels['note_formattxt'] = 'Texto puro';
 $labels['ariallabelnewoptions'] = 'Opções';
-$labels['note_rmedia_md'] = 'Exclua automaticamente a mídia incorporada com arquivos Markdown';
 ?>
diff --git a/localization/ru_RU.inc b/localization/ru_RU.inc
@@ -18,5 +18,4 @@ $labels['note_formattxt'] = 'Текстовая заметка';
 $labels['ariallabelnewoptions'] = 'Параметры';
 $labels['note_defaultformat'] = 'Стандартный формат';
 $labels['note_yamls'] = 'Активировать YAML';
-$labels['note_rmedia_md'] = 'Автоматическое удаление встроенного мультимедиа с помощью файлов Markdown';
 ?>
diff --git a/notes.php b/notes.php
@@ -2,7 +2,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 1.5.9
+ * @version 1.5.8
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
@@ -313,17 +313,6 @@
 	$file = $notes_path.$_POST["fileid"];
 
 	if(file_exists($file)) {
-		if(substr ($file, -3) == ".md" && boolval($rcmail->config->get('rm_md_media', false))) {
-			$fcontent = file_get_contents($file);
-			$mpath = dirname($file);
-			preg_match_all('/(?:!\[(.*?)\]\((.*?)\))/m', $fcontent, $mediaFiles, PREG_SET_ORDER, 0);
-			foreach($mediaFiles as $mKey => $mFile) {
-				if(!unlink($mpath.ltrim($mFile[2],'.'))) {
-					error_log('PrimitiveNotes: Couldn\'t delete media file. Please check your directory permissions.');
-				}
-			}
-		}
-
 		if(!unlink($file)) {
 			error_log('PrimitiveNotes: Couldn\'t delete note. Please check your directory permissions.');
 		}
diff --git a/primitivenotes.js b/primitivenotes.js
@@ -1,7 +1,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 1.5.9
+ * @version 1.5.8
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
diff --git a/primitivenotes.min.js b/primitivenotes.min.js
diff --git a/primitivenotes.php b/primitivenotes.php
@@ -2,7 +2,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 1.5.9
+ * @version 1.5.7
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
@@ -71,23 +71,14 @@ function pmn_preferences_list($p) {
 		$p['blocks']['main']['options']['pn_yaml'] = array(	'title'=> html::label($field_id, $this->gettext('note_yamls')),
 															'content'=> $input->show(intval($rcmail->config->get('yaml_support'))));
 
-		$field_id='rm_md_media';
-		$input = new html_checkbox(array(	'name'	=> 'rm_md_media',
-											'id'	=> 'rm_md_media',
-											'value' => 1));
-
-		$p['blocks']['main']['options']['pn_rmed'] = array(	'title'=> html::label($field_id, $this->gettext('note_rmedia_md')),
-															'content'=> $input->show(intval($rcmail->config->get('rm_md_media'))));
-
 		return $p;
 	}
 	
 	function pmn_preferences_save($p) {
 		if ($p['section'] == 'primitivenotes') {
 			$p['prefs'] = array(
 				'default_format'	=> strval(rcube_utils::get_input_value('default_format', rcube_utils::INPUT_POST)),
-				'yaml_support'		=> intval(rcube_utils::get_input_value('yaml_support', rcube_utils::INPUT_POST)),
-				'rm_md_media'		=> intval(rcube_utils::get_input_value('rm_md_media', rcube_utils::INPUT_POST))
+				'yaml_support'	=> intval(rcube_utils::get_input_value('yaml_support', rcube_utils::INPUT_POST))
 				);
 		}
 		
diff --git a/skins/primitivenotes.css b/skins/primitivenotes.css
@@ -292,12 +292,12 @@ object {
 	margin: 0 0 -5px 0;
 	user-select: all;
 	width: unset;
-	background: #eed7d7;
+	background: #f8f8f8;
 	font-size: .92em;
-	font-family: Consolas,Monaco,monospace !important;
-	color: #e93700;
+	font-family: Consolas, Monaco, monospace !important;
+	color: #e96900;
 	padding: 2px 4px;
-	border-radius: 5px;
+	border-radius: 2px;
 	display: inline-block;
 	white-space: pre;
 }
@@ -323,7 +323,6 @@ object {
 }
 .editor-preview pre code {
 	color: unset;
-	background: unset;
 }
 .editor-preview {
     background: #fff;
diff --git a/skins/primitivenotes.min.css b/skins/primitivenotes.min.css

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* Roundcube Notes Plugin`
`3`	`3`	`*`
`4`		`- * @version 1.5.9`
	`4`	`+ * @version 1.5.8`
`5`	`5`	`* @author Offerel`
`6`	`6`	`* @copyright Copyright (c) 2021, Offerel`
`7`	`7`	`* @license GNU General Public License, version 3`