- put config to confdir

Changed files:
    confdir.patch -> 1.1
    dokuwiki-plugin-redirect.spec -> 1.3

diff --git a/confdir.patch b/confdir.patch
new file mode 100644 (file)
index 0000000..5f57659
--- /dev/null
+++ b/confdir.patch
@@ -0,0 +1,31 @@
+--- dokuwiki-plugin-redirect-20100613/action.php       2011-02-06 20:26:05.000000000 +0200
++++ dokuwiki-plugin-redirect-20100613/action.php       2012-05-30 16:28:11.153277934 +0300
+@@ -34,7 +34,7 @@
+ 
+         if($ACT != 'show') return;
+ 
+-        $redirects = confToHash(dirname(__FILE__).'/redirect.conf');
++        $redirects = confToHash(DOKU_CONF.'/redirect.conf');
+         if($redirects[$ID]){
+             if(preg_match('/^https?:\/\//',$redirects[$ID])){
+                 send_redirect($redirects[$ID]);
+--- dokuwiki-plugin-redirect-20100613/admin.php        2011-02-06 20:26:05.000000000 +0200
++++ dokuwiki-plugin-redirect-20100613/admin.php        2012-05-30 16:28:48.784865018 +0300
+@@ -37,7 +37,7 @@
+      */
+     function handle() {
+         if($_POST['redirdata']){
+-            if(io_saveFile(dirname(__FILE__).'/redirect.conf',$_POST['redirdata'])){
++            if(io_saveFile(DOKU_CONF.'/redirect.conf',$_POST['redirdata'])){
+                 msg($this->getLang('saved'),1);
+             }
+         }
+@@ -53,7 +53,7 @@
+         echo '<input type="hidden" name="do" value="admin" />';
+         echo '<input type="hidden" name="page" value="redirect" />';
+         echo '<textarea class="edit" rows="15" cols="80" style="height: 300px" name="redirdata">';
+-        echo formtext(io_readFile(dirname(__FILE__).'/redirect.conf'));
++        echo formtext(io_readFile(DOKU_CONF.'/redirect.conf'));
+         echo '</textarea><br />';
+         echo '<input type="submit" value="'.$lang['btn_save'].'" class="button" />';
+         echo '</form>';

diff --git a/dokuwiki-plugin-redirect.spec b/dokuwiki-plugin-redirect.spec
index 5f28d27d2ea65df4fdda9fb90adf35207927c914..6ca792a544e5fe76ccf4dd9168e746f481acf23e 100644 (file)
--- a/dokuwiki-plugin-redirect.spec
+++ b/dokuwiki-plugin-redirect.spec
@@ -9,6 +9,7 @@ License:        GPL v2
 Group:         Applications/WWW
 Source0:       http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
 # Source0-md5: 8d5d6191b14ef16bc75975d1f206fa72
+Patch0:                confdir.patch
 URL:           http://www.dokuwiki.org/plugin:redirect
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.520
@@ -30,6 +31,7 @@ central configuration file.
 %prep
 %setup -qc
 mv *-%{plugin}-*/* .
+%patch0 -p1
 
 version=$(awk '/^date/{print $2}' plugin.info.txt)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then