Skip to content
Snippets Groups Projects
Commit d0c0a5c4 authored by Anika Henke's avatar Anika Henke
Browse files

removed implementation of _getcsv() in usermanager

Our minimum PHP version requirement is now over 5.3, so this workaround is
not needed anymore. See also c9454ee3
parent aa13c9aa
No related branches found
No related tags found
No related merge requests found
......@@ -150,20 +150,6 @@ importiso8859,"F'.chr(0xF8).'rd Prefect",ford@example.com,user
$this->doImportTest($csv, true, $expected, array());
}
/**
* Verify usermanager::str_getcsv() behaves identically to php 5.3's str_getcsv()
* within the context/parameters required by _import()
*
* @requires PHP 5.3
* @deprecated remove when dokuwiki requires 5.3+
* also associated usermanager & mock usermanager access methods
*/
function test_getcsvcompatibility() {
$line = 'importuser,"Ford Prefect",ford@example.com,user'.NL;
$this->assertEquals(str_getcsv($line), $this->usermanager->access_str_getcsv($line));
}
private function stripPasswords($array){
foreach ($array as $user => $data) {
unset($array[$user]['pass']);
......
......@@ -26,14 +26,6 @@ class admin_mock_usermanager extends admin_plugin_usermanager {
return $this->_import();
}
/**
* @deprecated remove when dokuwiki requires php 5.3+
* also associated unit test & usermanager methods
*/
public function access_str_getcsv($line){
return $this->str_getcsv($line);
}
// no need to send email notifications (mostly)
protected function _notifyUser($user, $password, $status_alert=true) {
if ($this->mock_email_notifications) {
......
......@@ -942,7 +942,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
if (!utf8_check($csv)) {
$csv = utf8_encode($csv);
}
$raw = $this->_getcsv($csv);
$raw = str_getcsv($csv);
$error = ''; // clean out any errors from the previous line
// data checks...
if (1 == ++$line) {
......@@ -1080,37 +1080,4 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
protected function _isUploadedFile($file) {
return is_uploaded_file($file);
}
/**
* wrapper for str_getcsv() to simplify maintaining compatibility with php 5.2
*
* @deprecated remove when dokuwiki php requirement increases to 5.3+
* also associated unit test & mock access method
*
* @param string $csv string to parse
* @return array
*/
protected function _getcsv($csv) {
return function_exists('str_getcsv') ? str_getcsv($csv) : $this->str_getcsv($csv);
}
/**
* replacement str_getcsv() function for php < 5.3
* loosely based on www.php.net/str_getcsv#88311
*
* @deprecated remove when dokuwiki php requirement increases to 5.3+
*
* @param string $str string to parse
* @return array
*/
protected function str_getcsv($str) {
$fp = fopen("php://temp/maxmemory:1048576", 'r+'); // 1MiB
fputs($fp, $str);
rewind($fp);
$data = fgetcsv($fp);
fclose($fp);
return $data;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment