diff options
| author | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
| commit | 0f8ac4e8c5872a6b68b350f96a9ecde0291edefa (patch) | |
| tree | ad7938bb4143d5e5a38fd7a8d131e4171aec657d /lib/plugins/plugin/classes/ap_download.class.php | |
| parent | 58ec8fa9128e4581749955de87530f432e387588 (diff) | |
| parent | b31fcef02fd24b3e746c9618e77152c7b84c2f2a (diff) | |
| download | rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.gz rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/plugin/classes/ap_download.class.php')
| -rw-r--r-- | lib/plugins/plugin/classes/ap_download.class.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index b2571f632..d1b518d9d 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -8,8 +8,9 @@ class ap_download extends ap_manage { */ function process() { global $lang; + global $INPUT; - $plugin_url = $_REQUEST['url']; + $plugin_url = $INPUT->str('url'); $this->download($plugin_url, $this->overwrite); return ''; } @@ -155,16 +156,16 @@ class ap_download extends ap_manage { $info['type'] = 'plugin'; $info['tmp'] = "$base/$dir"; $conf = confToHash("$base/$dir/$f"); - $info['base'] = basename($conf['base']); - if(!$info['base']) $info['base'] = basename("$base/$dir"); + $info['base'] = utf8_basename($conf['base']); + if(!$info['base']) $info['base'] = utf8_basename("$base/$dir"); $result['new'][] = $info; }elseif($f == 'template.info.txt'){ $info = array(); $info['type'] = 'template'; $info['tmp'] = "$base/$dir"; $conf = confToHash("$base/$dir/$f"); - $info['base'] = basename($conf['base']); - if(!$info['base']) $info['base'] = basename("$base/$dir"); + $info['base'] = utf8_basename($conf['base']); + if(!$info['base']) $info['base'] = utf8_basename("$base/$dir"); $result['new'][] = $info; } }else{ |