closes #14

PF4Public · May 16, 2016 · 32741b2 · 32741b2
1 parent aa31d0e
commit 32741b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/config/config.inc.php → config.inc.php.dist b/config/config.inc.php → config.inc.php.dist
diff --git a/fetchmail.php b/fetchmail.php
@@ -13,7 +13,8 @@
 class fetchmail extends rcube_plugin {
 	public $task = 'settings';
 	function init() {
-		$this->load_config ();
+		$this->load_config('config.inc.php.dist');
+		$this->load_config();
 		$this->add_texts ( 'localization/', true );
 		$rcmail = rcmail::get_instance ();
 		$this->register_action ( 'plugin.fetchmail', array (
@@ -46,18 +47,6 @@ function init() {
 		) );
 		$this->include_script ( 'fetchmail.js' );
 	}
-	function load_config() {
-		$rcmail = rcmail::get_instance ();
-		$config = "plugins/fetchmail/config/config.inc.php";
-		if (file_exists ( $config ))
-			include $config;
-		else if (file_exists ( $config . ".dist" ))
-			include $config . ".dist";
-		if (is_array ( $rcmail_config )) {
-			$arr = array_merge ( $rcmail->config->all (), $rcmail_config );
-			$rcmail->config->merge ( $arr );
-		}
-	}
 
 	function init_html() {
 		$rcmail = rcmail::get_instance ();