From e4f389ef1728a0f86164a0e4b88626be9860dabb Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 26 May 2011 14:23:33 +0300
Subject: media version saving

---
 inc/pageutils.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'inc/pageutils.php')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index c9bf60135..51567191e 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -307,6 +307,19 @@ function metaFN($id,$ext){
     return $fn;
 }
 
+/**
+ * returns the full path to the media's meta file specified by ID and extension
+ *
+ * The filename is URL encoded to protect Unicode chars
+ */
+function mediaMetaFN($id,$ext){
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    $fn = $conf['mediametadir'].'/'.utf8_encodeFN($id).$ext;
+    return $fn;
+}
+
 /**
  * returns an array of full paths to all metafiles of a given ID
  *
@@ -327,11 +340,16 @@ function metaFiles($id){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function mediaFN($id){
+function mediaFN($id, $rev=''){
     global $conf;
     $id = cleanID($id);
     $id = str_replace(':','/',$id);
-    $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
+    if(empty($rev)){
+        $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
+    }else{
+    	list($name, $ext) = explode(".", $id);
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.$rev.'.'.utf8_encodeFN($ext);
+    }
     return $fn;
 }
 
-- 
cgit v1.2.3


From cbe26ad6152c998c9a3290b0d321030c61dc7f1b Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 4 Jun 2011 19:12:06 +0300
Subject: media version saving fix

---
 inc/pageutils.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc/pageutils.php')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 51567191e..37b15a498 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -295,8 +295,6 @@ function wikiLockFN($id) {
 /**
  * returns the full path to the meta file specified by ID and extension
  *
- * The filename is URL encoded to protect Unicode chars
- *
  * @author Steven Danz <steven-danz@kc.rr.com>
  */
 function metaFN($id,$ext){
@@ -310,7 +308,7 @@ function metaFN($id,$ext){
 /**
  * returns the full path to the media's meta file specified by ID and extension
  *
- * The filename is URL encoded to protect Unicode chars
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function mediaMetaFN($id,$ext){
     global $conf;
@@ -339,6 +337,7 @@ function metaFiles($id){
  * The filename is URL encoded to protect Unicode chars
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function mediaFN($id, $rev=''){
     global $conf;
@@ -347,8 +346,9 @@ function mediaFN($id, $rev=''){
     if(empty($rev)){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
-    	list($name, $ext) = explode(".", $id);
-        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.$rev.'.'.utf8_encodeFN($ext);
+    	$ext = mimetype($id);
+    	$name = substr($id, 0, strrpos($id, '.'));
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.(int)$rev.'.'.utf8_encodeFN($ext[0]);
     }
     return $fn;
 }
-- 
cgit v1.2.3


From 61f1aad8f877bdf33a160812d88b60c56aed1040 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 5 Jun 2011 21:00:51 +0300
Subject: media version saving fixes

---
 inc/pageutils.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/pageutils.php')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 37b15a498..09a23cbdd 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -347,8 +347,8 @@ function mediaFN($id, $rev=''){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
     	$ext = mimetype($id);
-    	$name = substr($id, 0, strrpos($id, '.'));
-        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.(int)$rev.'.'.utf8_encodeFN($ext[0]);
+    	$name = substr($id,0, -1*strlen($ext[0]));
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name .'.'.( (int) $rev ).'.'.$ext[0]);
     }
     return $fn;
 }
-- 
cgit v1.2.3


From 8e69fd30702f1101a9c70dbe6eac6f45f9af3970 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 13 Jun 2011 20:23:18 +0300
Subject: media manager

---
 inc/pageutils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/pageutils.php')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 09a23cbdd..81dcb66e7 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -347,7 +347,7 @@ function mediaFN($id, $rev=''){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
     	$ext = mimetype($id);
-    	$name = substr($id,0, -1*strlen($ext[0]));
+    	$name = substr($id,0, -1*strlen($ext[0])-1);
         $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name .'.'.( (int) $rev ).'.'.$ext[0]);
     }
     return $fn;
-- 
cgit v1.2.3