MDL-16403

1. move boxnet lib to moodle lib folder
2. fix a notice

diff --git a/repository/boxnet/boxlibphp5.php b/lib/boxlib.php
similarity index 98%
rename from repository/boxnet/boxlibphp5.php
rename to lib/boxlib.php
index 8bc2df1e5252bafbba962e9d790ae4d75a6090c7..14aec630e30c70c9ac28227b11b0aff345450fd4 100755 (executable)
--- a/repository/boxnet/boxlibphp5.php
+++ b/lib/boxlib.php
@@ -262,11 +262,19 @@ class boxclient {
                 break;
 
             case 'FOLDER_NAME':
-                $ret_array['folder_type'] = $a['value'];
+                $ret_array['folder_name'] = $a['value'];
+                break;
+
+            case 'FOLDER_TYPE_ID':
+                $ret_array['folder_type_id'] = $a['value'];
                 break;
 
             case 'SHARED':
-                $ret_array['shared'] = $a['value'];
+                if(!empty($a['value'])){
+                    $ret_array['shared'] = $a['value'];
+                }else{
+                    $ret_array['shared'] = false;
+                }
                 break;
             case 'PASSWORD':
                 $ret_array['password'] = $a['value'];

diff --git a/portfolio/type/boxnet/lib.php b/portfolio/type/boxnet/lib.php
index e84fa997fbcc55ad678da37655e5b7ff24ab1974..1ed05c056d8bfa86a670c993a19451e48c1c50cd 100644 (file)
--- a/portfolio/type/boxnet/lib.php
+++ b/portfolio/type/boxnet/lib.php
@@ -1,6 +1,6 @@
 <?php
 require_once($CFG->libdir.'/filelib.php');
-require_once($CFG->dirroot.'/repository/boxnet/boxlibphp5.php');
+require_once($CFG->libdir.'/boxlib.php');
 
 class portfolio_plugin_boxnet extends portfolio_plugin_push_base {
 

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 2ff416c49982cd575977c4d4583ff21c95b851c3..0440cf109605a1f357ec9235dfbf57cd2d1e8830 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -8,7 +8,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-require_once($CFG->dirroot.'/repository/boxnet/'.'boxlibphp5.php');
+require_once($CFG->libdir.'/boxlib.php');
 
 class repository_boxnet extends repository{
     private $box;
@@ -187,8 +187,11 @@ class repository_boxnet extends repository{
                     $e4->type  = 'password';
                     $e4->name  = 'boxpassword';
 
+                    $e5->type = 'popup';
+                    $e5->url = 'http://dongsheng.moodle.com/m20/repository/callback.php';
+
                     $ret = array();
-                    $ret['login'] = array($e1, $e2, $e3, $e4);
+                    $ret['login'] = array($e1, $e2, $e3, $e4, $e5);
                     return $ret;
                 } else {
                     echo $str;