Prepare for the composer-based plugin repository; skip PEAR dependencies for now

2 files changed, 8 insertions, 22 deletions

diff --git a/composer.json-dist b/composer.json-dist
index 846f742eb..1c2ac80bd 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -1,35 +1,16 @@
 {
     "name": "roundcube/roundcubemail",
     "description": "The Roundcube Webmail suite",
-    "license": "GPL-3.0",
+    "license": "GPL-3.0+",
     "repositories": [
         {
             "type": "composer",
             "url": "http://plugins.roundcube.net/"
-        },
-        {
-            "type": "pear",
-            "url": "http://pear.php.net/"
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "Net_SMTP",
-                "version": "dev-master",
-                "source": {
-                    "url": "http://github.com/pear/Net_SMTP",
-                    "type": "git",
-                    "reference": "master"
-                }
-            }
         }
     ],
     "require": {
-        "pear-pear/Mail_Mime": ">=1.8.1",
-        "pear-pear/Mail_mimeDecode": ">=1.5.5",
-        "Net_SMTP": "dev-master",
-        "pear-pear/Net_IDNA2": ">=0.1.1",
-        "pear-pear/Auth_SASL": ">=1.0.6"
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.2"
     },
     "minimum-stability": "dev"
 }
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 913d3d7f6..919cc7682 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -60,6 +60,11 @@ require_once 'Roundcube/bootstrap.php';
 // register autoloader for rcmail app classes
 spl_autoload_register('rcmail_autoload');
 
+// include composer autoloader (if available)
+if (file_exists('vendor/autoload.php')) {
+    require 'vendor/autoload.php';
+}
+
 // backward compatybility (to be removed)
 require_once INSTALL_PATH . 'program/include/bc.php';