summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-10-01 09:21:22 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-10-01 09:21:22 +0000
commit37d409bde13d8a601e9a816083ae6677b3ee1a8a (patch)
tree86b8377960296ad05cd447ef71da97ad455ce935
parent0bae361ef6ce5f106804163a337fe12a739a78fa (diff)
- Allow calling msgimport.sh/msgexport.sh from any directory (#1485431)
git-svn-id: https://svn.roundcube.net/trunk@1906 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rwxr-xr-xroundcubemail/bin/msgexport.sh2
-rwxr-xr-xroundcubemail/bin/msgimport.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index ab7fd2bbd..8a5eaac0b 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -4,6 +4,7 @@ CHANGELOG RoundCube Webmail
2008/10/01 (alec)
- Fix spellchecking when switching to html editor (#1485362)
- Fix compose window width/height (#1485396)
+- Allow calling msgimport.sh/msgexport.sh from any directory (#1485431)
2008/09/29 (alec)
----------
diff --git a/roundcubemail/bin/msgexport.sh b/roundcubemail/bin/msgexport.sh
index 33d5d4b4a..b15da1feb 100755
--- a/roundcubemail/bin/msgexport.sh
+++ b/roundcubemail/bin/msgexport.sh
@@ -1,7 +1,7 @@
#!/usr/bin/php
<?php
-define('INSTALL_PATH', preg_replace('/bin\/$/', '', getcwd()) . '/');
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
ini_set('memory_limit', -1);
require_once INSTALL_PATH.'program/include/iniset.php';
diff --git a/roundcubemail/bin/msgimport.sh b/roundcubemail/bin/msgimport.sh
index 9bd97c61c..fa5678cec 100755
--- a/roundcubemail/bin/msgimport.sh
+++ b/roundcubemail/bin/msgimport.sh
@@ -1,7 +1,7 @@
#!/usr/bin/php
<?php
-define('INSTALL_PATH', preg_replace('/bin\/$/', '', getcwd()) . '/');
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
ini_set('memory_limit', -1);
require_once INSTALL_PATH.'program/include/iniset.php';