From 30f1bdbd15f155d89b8b62b4f0f9fe44e767462c Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Mon, 22 Sep 2014 15:09:04 +0800
Subject: [PATCH 1/2] add download token demo

---
 demo/download_token.php | 27 +++++++++++++++++++++++++++
 demo/up.php             |  6 ++----
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 demo/download_token.php

diff --git a/demo/download_token.php b/demo/download_token.php
new file mode 100644
index 00000000..f282a247
--- /dev/null
+++ b/demo/download_token.php
@@ -0,0 +1,27 @@
+<?php
+require_once('../qiniu/utils.php');
+require_once('../qiniu/auth_digest.php');
+
+function dnToken($url, $expires = 3600)
+{
+
+    $e = 'e=' . (time() + $expires);
+
+    $qry = parse_url($url, PHP_URL_QUERY);
+    if ($qry) {
+        $url .= '&' . $e;
+    } else {
+        $url .= '?' . $e;
+    }
+
+    $sign = Qiniu_Sign(null, $url);
+
+    return $url . '&token=' . $sign;
+}
+
+$url = 'http://sslayer.qiniudn.com/dive-into-golang.pptx';
+echo dnToken($url);
+
+echo "\n";
+$url = 'http://sslayer.qiniudn.com/dive-into-golang.pptx?odconv/pdf';
+echo dnToken($url);
diff --git a/demo/up.php b/demo/up.php
index 6922a57d..22d12fae 100644
--- a/demo/up.php
+++ b/demo/up.php
@@ -9,18 +9,16 @@
 
 
 $client = new Qiniu_MacHttpClient(null);
-$putPolicy = new Qiniu_RS_PutPolicy($bucket);
-$putPolicy->Scope = "$bucket:$key";
+$putPolicy = new Qiniu_RS_PutPolicy("$bucket:$key");
 $putPolicy->CallbackUrl = 'https://10fd05306325.a.passageway.io';
 $putPolicy->CallbackBody = 'key=$(key)&hash=$(etag)';
 $upToken = $putPolicy->Token(null);
 
 $putExtra = new Qiniu_PutExtra();
-$putExtra->Crc32 = 1;
 $s = time();
 list($ret, $err) = Qiniu_PutFile($upToken, $key, $file, $putExtra);
 echo "time elapse:". (time() - $s) . "\n";
-echo "\n\n====> Qiniu_PutFile result: \n";
+echo "====> Qiniu_PutFile result: \n";
 if ($err !== null) {
     var_dump($err);
 } else {

From 660461d9c1d007345df2b913c83a01b9e161c3f5 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Mon, 22 Sep 2014 15:12:50 +0800
Subject: [PATCH 2/2] add Comments

---
 demo/up.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/up.php b/demo/up.php
index 22d12fae..3f52e257 100644
--- a/demo/up.php
+++ b/demo/up.php
@@ -5,7 +5,7 @@
 
 $bucket = 'rwxf';
 $key = 'up.php';
-$file = __FILE__;
+$file = __FILE__;  //path to local file
 
 
 $client = new Qiniu_MacHttpClient(null);