From 5c967d3d04622c1420313f1a514da5cda99827f3 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 1 Aug 2013 18:04:01 +0200 Subject: add csv export functionality to the user manager --- lib/plugins/usermanager/admin.php | 39 +++++++++++++++++++++++++++++++- lib/plugins/usermanager/lang/en/lang.php | 2 ++ 2 files changed, 40 insertions(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index ca4c6a650..72ac47e15 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -101,6 +101,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { case "search" : $this->_setFilter($param); $this->_start = 0; break; + case "export" : $this->_export(); break; } $this->_user_total = $this->_auth->canDo('getUserCount') ? $this->_auth->getUserCount($this->_filter) : -1; @@ -133,6 +134,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $delete_disable = $this->_auth->canDo('delUser') ? '' : 'disabled="disabled"'; $editable = $this->_auth->canDo('UserMod'); + $export_label = empty($this->_filter) ? $this->lang['export_all'] : $this->lang[export_filtered]; print $this->locale_xhtml('intro'); print $this->locale_xhtml('list'); @@ -196,7 +198,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" lang['next']."\" />"); ptln(" lang['last']."\" />"); ptln(" "); - ptln(" lang['clear']."\" />"); + if (!empty($this->_filter)) { + ptln(" lang['clear']."\" />"); + } + ptln(" "); ptln(" "); ptln(" "); @@ -629,4 +634,36 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { return $buttons; } + + /* + * export a list of users in csv format using the current filter criteria + */ + function _export() { + // list of users for export - based on current filter criteria + $user_list = $this->_auth->retrieveUsers(0, 0, $this->_filter); + $column_headings = array( + $this->lang["user_id"], + $this->lang["user_name"], + $this->lang["user_mail"], + $this->lang["user_groups"] + ); + + // ============================================================================================== + // GENERATE OUTPUT + // normal headers for downloading... + header('Content-type: text/csv;charset=utf-8'); + header('Content-Disposition: attachment; filename="wikiusers.csv"'); +# // for debugging assistance, send as text plain to the browser +# header('Content-type: text/plain;charset=utf-8'); + + // output the csv + $fd = fopen('php://output','w'); + fputcsv($fd, $column_headings); + foreach ($user_list as $user => $info) { + $line = array($user, $info['name'], $info['mail'], join(',',$info['grps'])); + fputcsv($fd, $line); + } + fclose($fd); + die; + } } diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index 189a1db20..ae0ee1c16 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -31,6 +31,8 @@ $lang['search'] = 'Search'; $lang['search_prompt'] = 'Perform search'; $lang['clear'] = 'Reset Search Filter'; $lang['filter'] = 'Filter'; +$lang['export_all'] = 'Export All Users (CSV)'; +$lang['export_filtered'] = 'Export Filtered User list (CSV)'; $lang['summary'] = 'Displaying users %1$d-%2$d of %3$d found. %4$d users total.'; $lang['nonefound'] = 'No users found. %d users total.'; -- cgit v1.2.3 From ae1afd2f6529e4d07b18317304e5e2c302d783ce Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 2 Aug 2013 17:21:48 +0200 Subject: add csv import functionality to the user manager --- lib/plugins/usermanager/admin.php | 187 +++++++++++++++++++++++++++++ lib/plugins/usermanager/lang/en/import.txt | 9 ++ lib/plugins/usermanager/lang/en/lang.php | 15 +++ lib/plugins/usermanager/style.css | 3 + 4 files changed, 214 insertions(+) create mode 100644 lib/plugins/usermanager/lang/en/import.txt (limited to 'lib/plugins') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 72ac47e15..ddf10a115 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -30,6 +30,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { var $_edit_user = ''; // set to user selected for editing var $_edit_userdata = array(); var $_disabled = ''; // if disabled set to explanatory string + var $_import_failures = array(); /** * Constructor @@ -49,6 +50,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $this->_auth = & $auth; } + + // attempt to retrieve any import failures from the session + if ($_SESSION['import_failures']){ + $this->_import_failures = $_SESSION['import_failures']; + } } /** @@ -102,6 +108,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $this->_start = 0; break; case "export" : $this->_export(); break; + case "import" : $this->_import(); break; + case "importfails" : $this->_downloadImportFailures(); break; } $this->_user_total = $this->_auth->canDo('getUserCount') ? $this->_auth->getUserCount($this->_filter) : -1; @@ -238,6 +246,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" "); ptln(""); } + + if ($this->_auth->canDo('addUser')) { + $this->_htmlImportForm(); + } ptln(""); } @@ -352,6 +364,59 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } } + function _htmlImportForm($indent=0) { + global $ID; + + $failure_download_link = wl($ID,array('do'=>'admin','page'=>'usermanager','fn[importfails]'=>1)); + + ptln('
',$indent); + print $this->locale_xhtml('import'); + ptln('
',$indent); + formSecurityToken(); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + + $this->_htmlFilterSettings($indent+4); + ptln('
',$indent); + ptln('
'); + + // list failures from the previous import + if ($this->_import_failures) { + $digits = strlen(count($this->_import_failures)); + ptln('
',$indent); + ptln('

Most Recent Import - Failures

'); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + foreach ($this->_import_failures as $line => $failure) { + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ', $indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + ptln(' ',$indent); + } + ptln(' ',$indent); + ptln('
'.$this->lang['line'].''.$this->lang['error'].''.$this->lang['user_id'].''.$this->lang['user_name'].''.$this->lang['user_mail'].''.$this->lang['user_groups'].'
'.sprintf('%0'.$digits.'d',$line).' ' .$failure['error'].' '.hsc($failure['user'][0]).' '.hsc($failure['user'][2]).' '.hsc($failure['user'][3]).' '.hsc($failure['user'][4]).'
',$indent); + ptln('

Download Failures as CSV for correction

'); + ptln('
'); + } + + } + function _addUser(){ global $INPUT; if (!checkSecurityToken()) return false; @@ -666,4 +731,126 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { fclose($fd); die; } + + /* + * import a file of users in csv format + * + * csv file should have 4 columns, user_id, full name, email, groups (comma separated) + */ + function _import() { + // check we are allowed to add users + if (!checkSecurityToken()) return false; + if (!$this->_auth->canDo('addUser')) return false; + + // check file uploaded ok. + if (empty($_FILES['import']['size']) || !empty($FILES['import']['error']) && is_uploaded_file($FILES['import']['tmp_name'])) { + msg($this->lang['import_error_upload'],-1); + return false; + } + // retrieve users from the file + $this->_import_failures = array(); + $import_success_count = 0; + $import_fail_count = 0; + $line = 0; + $fd = fopen($_FILES['import']['tmp_name'],'r'); + if ($fd) { + while($csv = fgets($fd)){ + $raw = str_getcsv($csv); + $error = ''; // clean out any errors from the previous line + // data checks... + if (1 == ++$line) { + if ($raw[0] == 'user_id' || $raw[0] == $this->lang['user_id']) continue; // skip headers + } + if (count($raw) < 4) { // need at least four fields + $import_fail_count++; + $error = sprintf($this->lang['import_error_fields'], count($raw)); + $this->_import_failures[$line] = array('error' => $error, 'user' => $raw, 'orig' => $csv); + continue; + } + array_splice($raw,1,0,auth_pwgen()); // splice in a generated password + $clean = $this->_cleanImportUser($raw, $error); + if ($clean && $this->_addImportUser($clean, $error)) { +# $this->_notifyUser($clean[0],$clean[1]); + $import_success_count++; + } else { + $import_fail_count++; + $this->_import_failures[$line] = array('error' => $error, 'user' => $raw, 'orig' => $csv); + } + } + msg(sprintf($this->lang['import_success_count'], ($import_success_count+$import_fail_count), $import_success_count),($import_success_count ? 1 : -1)); + if ($import_fail_count) { + msg(sprintf($this->lang['import_failure_count'], $import_fail_count),-1); + } + } else { + msg($this->lang['import_error_readfail'],-1); + } + + // save import failures into the session + if (!headers_sent()) { + session_start(); + $_SESSION['import_failures'] = $this->_import_failures; + session_write_close(); + } + } + + function _cleanImportUser($candidate, & $error){ + global $INPUT; + + // kludgy .... + $INPUT->set('userid', $candidate[0]); + $INPUT->set('userpass', $candidate[1]); + $INPUT->set('username', $candidate[2]); + $INPUT->set('usermail', $candidate[3]); + $INPUT->set('usergroups', $candidate[4]); + + $cleaned = $this->_retrieveUser(); + list($user,$pass,$name,$mail,$grps) = $cleaned; + if (empty($user)) { + $error = $this->lang['import_error_baduserid']; + return false; + } + + // no need to check password, handled elsewhere + + if (!($this->_auth->canDo('modName') xor empty($name))){ + $error = $this->lang['import_error_badname']; + return false; + } + + if (!($this->_auth->canDo('modMail') xor empty($mail))){ + $error = $this->lang['import_error_badmail']; + return false; + } + + return $cleaned; + } + + function _addImportUser($user, & $error){ + if (!$this->_auth->triggerUserMod('create', $user)) { + $error = $this->lang['import_error_create']; + return false; + } + + return true; + } + + function _downloadImportFailures(){ + + // ============================================================================================== + // GENERATE OUTPUT + // normal headers for downloading... + header('Content-type: text/csv;charset=utf-8'); + header('Content-Disposition: attachment; filename="importfails.csv"'); +# // for debugging assistance, send as text plain to the browser +# header('Content-type: text/plain;charset=utf-8'); + + // output the csv + $fd = fopen('php://output','w'); + foreach ($this->_import_failures as $line => $fail) { + fputs($fd, $fail['orig']); + } + fclose($fd); + die; + } + } diff --git a/lib/plugins/usermanager/lang/en/import.txt b/lib/plugins/usermanager/lang/en/import.txt new file mode 100644 index 000000000..2087083e0 --- /dev/null +++ b/lib/plugins/usermanager/lang/en/import.txt @@ -0,0 +1,9 @@ +===== Bulk User Import ===== + +Requires a CSV file of users with at least four columns. +The columns must contain, in order: user-id, full name, email address and groups. +The CSV fields should be separated by commas (,) and strings delimited by quotation marks (""). Backslash (\) can be used for escaping. +For an example of a suitable file, try the "Export Users" function above. +Duplicate user-ids will be ignored. + +A password will be generated and emailed to each successfully imported user. diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index ae0ee1c16..f22d1f805 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -33,6 +33,9 @@ $lang['clear'] = 'Reset Search Filter'; $lang['filter'] = 'Filter'; $lang['export_all'] = 'Export All Users (CSV)'; $lang['export_filtered'] = 'Export Filtered User list (CSV)'; +$lang['import'] = 'Import New Users'; +$lang['line'] = 'Line no.'; +$lang['error'] = 'Error message'; $lang['summary'] = 'Displaying users %1$d-%2$d of %3$d found. %4$d users total.'; $lang['nonefound'] = 'No users found. %d users total.'; @@ -58,3 +61,15 @@ $lang['add_fail'] = 'User addition failed'; $lang['notify_ok'] = 'Notification email sent'; $lang['notify_fail'] = 'Notification email could not be sent'; +// import errors +$lang['import_success_count'] = 'User Import: %d users found, %d imported successfully.'; +$lang['import_failure_count'] = 'User Import: %d failed. Failures are listed below.'; +$lang['import_error_fields'] = "Insufficient fields, found %d, require 4."; +$lang['import_error_baduserid'] = "User-id missing"; +$lang['import_error_badname'] = 'Bad name'; +$lang['import_error_badmail'] = 'Bad mail'; +$lang['import_error_upload'] = 'Import Failed. The csv file could not be uploaded or is empty.'; +$lang['import_error_readfail'] = 'Import Failed. Unable to read uploaded file.'; +$lang['import_error_create'] = 'Unable to create the user'; + + diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css index ff8e5d9d1..61b6c2c4e 100644 --- a/lib/plugins/usermanager/style.css +++ b/lib/plugins/usermanager/style.css @@ -17,4 +17,7 @@ color: #ccc!important; border-color: #ccc!important; } +#user__manager .import_failures { + margin-top: 1em; +} /* IE won't understand but doesn't require it */ -- cgit v1.2.3 From 328143f8a20933744be51a2693c99f35234ce5b3 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 2 Aug 2013 22:53:21 +0200 Subject: enable email notifications & alert messages for imported users --- lib/plugins/usermanager/admin.php | 28 +++++++++++++++++++++------- lib/plugins/usermanager/lang/en/lang.php | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index ddf10a115..395b91053 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -606,12 +606,16 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { /** * send password change notification email */ - function _notifyUser($user, $password) { + function _notifyUser($user, $password, $status_alert=true) { if ($sent = auth_sendPassword($user,$password)) { - msg($this->lang['notify_ok'], 1); + if ($status_alert) { + msg($this->lang['notify_ok'], 1); + } } else { - msg($this->lang['notify_fail'], -1); + if ($status_alert) { + msg($this->lang['notify_fail'], -1); + } } return $sent; @@ -770,7 +774,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { array_splice($raw,1,0,auth_pwgen()); // splice in a generated password $clean = $this->_cleanImportUser($raw, $error); if ($clean && $this->_addImportUser($clean, $error)) { -# $this->_notifyUser($clean[0],$clean[1]); + $sent = $this->_notifyUser($clean[0],$clean[1],false); + if (!$sent){ + msg(sprintf($this->lang['import_notify_fail'],$clean[0],$clean[3]),-1); + } $import_success_count++; } else { $import_fail_count++; @@ -817,9 +824,16 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { return false; } - if (!($this->_auth->canDo('modMail') xor empty($mail))){ - $error = $this->lang['import_error_badmail']; - return false; + if ($this->_auth->canDo('modMail')) { + if (empty($mail) || !mail_isvalid($mail)) { + $error = $this->lang['import_error_badmail']; + return false; + } + } else { + if (!empty($mail)) { + $error = $this->lang['import_error_badmail']; + return false; + } } return $cleaned; diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index f22d1f805..69119e196 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -67,9 +67,10 @@ $lang['import_failure_count'] = 'User Import: %d failed. Failures are listed bel $lang['import_error_fields'] = "Insufficient fields, found %d, require 4."; $lang['import_error_baduserid'] = "User-id missing"; $lang['import_error_badname'] = 'Bad name'; -$lang['import_error_badmail'] = 'Bad mail'; +$lang['import_error_badmail'] = 'Bad email address'; $lang['import_error_upload'] = 'Import Failed. The csv file could not be uploaded or is empty.'; $lang['import_error_readfail'] = 'Import Failed. Unable to read uploaded file.'; $lang['import_error_create'] = 'Unable to create the user'; +$lang['import_notify_fail'] = 'Notification message could not be sent for imported user, %s with email %s.'; -- cgit v1.2.3 From c4d11518ab222262dd0a974b9db5228ccb5df9d7 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 2 Aug 2013 22:55:32 +0200 Subject: style improvements --- lib/plugins/usermanager/style.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css index 61b6c2c4e..3529d8b32 100644 --- a/lib/plugins/usermanager/style.css +++ b/lib/plugins/usermanager/style.css @@ -17,7 +17,13 @@ color: #ccc!important; border-color: #ccc!important; } +#user__manager .import_users { + margin-top: 1.4em; +} #user__manager .import_failures { - margin-top: 1em; + margin-top: 1.4em; +} +#user__manager .import_failures td.lineno { + text-align: center; } /* IE won't understand but doesn't require it */ -- cgit v1.2.3 From 893decf1230dd0052bcf5db59a41ffeee9987715 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 17:40:29 +0200 Subject: add 'danger' alert to authad config settings --- lib/plugins/authad/conf/metadata.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php index fbc3f163c..29f9a5ae9 100644 --- a/lib/plugins/authad/conf/metadata.php +++ b/lib/plugins/authad/conf/metadata.php @@ -1,14 +1,14 @@ 0); -$meta['additional'] = array('string'); +$meta['account_suffix'] = array('string','_caution' => 'danger'); +$meta['base_dn'] = array('string','_caution' => 'danger'); +$meta['domain_controllers'] = array('string','_caution' => 'danger'); +$meta['sso'] = array('onoff','_caution' => 'danger'); +$meta['admin_username'] = array('string','_caution' => 'danger'); +$meta['admin_password'] = array('password','_caution' => 'danger'); +$meta['real_primarygroup'] = array('onoff','_caution' => 'danger'); +$meta['use_ssl'] = array('onoff','_caution' => 'danger'); +$meta['use_tls'] = array('onoff','_caution' => 'danger'); +$meta['debug'] = array('onoff','_caution' => 'danger'); +$meta['expirywarn'] = array('numeric', '_min'=>0,'_caution' => 'danger'); +$meta['additional'] = array('string','_caution' => 'danger'); -- cgit v1.2.3 From 7e2d11334fbe7c1174bfe6711f88a5625e982042 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 17:42:41 +0200 Subject: add 'danger' alert to authldap config settings --- lib/plugins/authldap/conf/metadata.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php index a3256628c..a165a322c 100644 --- a/lib/plugins/authldap/conf/metadata.php +++ b/lib/plugins/authldap/conf/metadata.php @@ -1,19 +1,19 @@ array(0,1,2,3)); -$meta['binddn'] = array('string'); -$meta['bindpw'] = array('password'); +$meta['server'] = array('string','_caution' => 'danger'); +$meta['port'] = array('numeric','_caution' => 'danger'); +$meta['usertree'] = array('string','_caution' => 'danger'); +$meta['grouptree'] = array('string','_caution' => 'danger'); +$meta['userfilter'] = array('string','_caution' => 'danger'); +$meta['groupfilter'] = array('string','_caution' => 'danger'); +$meta['version'] = array('numeric','_caution' => 'danger'); +$meta['starttls'] = array('onoff','_caution' => 'danger'); +$meta['referrals'] = array('onoff','_caution' => 'danger'); +$meta['deref'] = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger'); +$meta['binddn'] = array('string','_caution' => 'danger'); +$meta['bindpw'] = array('password','_caution' => 'danger'); //$meta['mapping']['name'] unsupported in config manager //$meta['mapping']['grps'] unsupported in config manager -$meta['userscope'] = array('multichoice','_choices' => array('sub','one','base')); -$meta['groupscope'] = array('multichoice','_choices' => array('sub','one','base')); -$meta['groupkey'] = array('string'); -$meta['debug'] = array('onoff'); \ No newline at end of file +$meta['userscope'] = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger'); +$meta['groupscope'] = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger'); +$meta['groupkey'] = array('string','_caution' => 'danger'); +$meta['debug'] = array('onoff','_caution' => 'danger'); \ No newline at end of file -- cgit v1.2.3 From 733675ab67406e6a89c9779ff871a55ad6d9dbea Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 17:43:28 +0200 Subject: add 'danger' alert to authmysql config settings --- lib/plugins/authmysql/conf/metadata.php | 64 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php index 05d150fdf..73e9ec1a8 100644 --- a/lib/plugins/authmysql/conf/metadata.php +++ b/lib/plugins/authmysql/conf/metadata.php @@ -1,34 +1,34 @@ array(0,1,2)); -$meta['forwardClearPass'] = array('onoff'); -$meta['TablesToLock'] = array('array'); -$meta['checkPass'] = array(''); -$meta['getUserInfo'] = array(''); -$meta['getGroups'] = array(''); -$meta['getUsers'] = array(''); -$meta['FilterLogin'] = array('string'); -$meta['FilterName'] = array('string'); -$meta['FilterEmail'] = array('string'); -$meta['FilterGroup'] = array('string'); -$meta['SortOrder'] = array('string'); -$meta['addUser'] = array(''); -$meta['addGroup'] = array(''); -$meta['addUserGroup'] = array(''); -$meta['delGroup'] = array(''); -$meta['getUserID'] = array(''); -$meta['delUser'] = array(''); -$meta['delUserRefs'] = array(''); -$meta['updateUser'] = array('string'); -$meta['UpdateLogin'] = array('string'); -$meta['UpdatePass'] = array('string'); -$meta['UpdateEmail'] = array('string'); -$meta['UpdateName'] = array('string'); -$meta['UpdateTarget'] = array('string'); -$meta['delUserGroup'] = array(''); -$meta['getGroupID'] = array(''); \ No newline at end of file +$meta['server'] = array('string','_caution' => 'danger'); +$meta['user'] = array('string','_caution' => 'danger'); +$meta['password'] = array('password','_caution' => 'danger'); +$meta['database'] = array('string','_caution' => 'danger'); +$meta['charset'] = array('string','_caution' => 'danger'); +$meta['debug'] = array('multichoice','_choices' => array(0,1,2),'_caution' => 'danger'); +$meta['forwardClearPass'] = array('onoff','_caution' => 'danger'); +$meta['TablesToLock'] = array('array','_caution' => 'danger'); +$meta['checkPass'] = array('','_caution' => 'danger'); +$meta['getUserInfo'] = array('','_caution' => 'danger'); +$meta['getGroups'] = array('','_caution' => 'danger'); +$meta['getUsers'] = array('','_caution' => 'danger'); +$meta['FilterLogin'] = array('string','_caution' => 'danger'); +$meta['FilterName'] = array('string','_caution' => 'danger'); +$meta['FilterEmail'] = array('string','_caution' => 'danger'); +$meta['FilterGroup'] = array('string','_caution' => 'danger'); +$meta['SortOrder'] = array('string','_caution' => 'danger'); +$meta['addUser'] = array('','_caution' => 'danger'); +$meta['addGroup'] = array('','_caution' => 'danger'); +$meta['addUserGroup'] = array('','_caution' => 'danger'); +$meta['delGroup'] = array('','_caution' => 'danger'); +$meta['getUserID'] = array('','_caution' => 'danger'); +$meta['delUser'] = array('','_caution' => 'danger'); +$meta['delUserRefs'] = array('','_caution' => 'danger'); +$meta['updateUser'] = array('string','_caution' => 'danger'); +$meta['UpdateLogin'] = array('string','_caution' => 'danger'); +$meta['UpdatePass'] = array('string','_caution' => 'danger'); +$meta['UpdateEmail'] = array('string','_caution' => 'danger'); +$meta['UpdateName'] = array('string','_caution' => 'danger'); +$meta['UpdateTarget'] = array('string','_caution' => 'danger'); +$meta['delUserGroup'] = array('','_caution' => 'danger'); +$meta['getGroupID'] = array('','_caution' => 'danger'); \ No newline at end of file -- cgit v1.2.3 From 39245054d28c2796f1922792c77f36fbcf29f6e7 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 17:43:51 +0200 Subject: add 'danger' alert to authpgsql config settings --- lib/plugins/authpgsql/conf/metadata.php | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authpgsql/conf/metadata.php b/lib/plugins/authpgsql/conf/metadata.php index d52a17865..9868cf9b5 100644 --- a/lib/plugins/authpgsql/conf/metadata.php +++ b/lib/plugins/authpgsql/conf/metadata.php @@ -1,33 +1,33 @@ 'danger'); +$meta['port'] = array('numeric','_caution' => 'danger'); +$meta['user'] = array('string','_caution' => 'danger'); +$meta['password'] = array('password','_caution' => 'danger'); +$meta['database'] = array('string','_caution' => 'danger'); +$meta['debug'] = array('onoff','_caution' => 'danger'); +$meta['forwardClearPass'] = array('onoff','_caution' => 'danger'); +$meta['checkPass'] = array('','_caution' => 'danger'); +$meta['getUserInfo'] = array('','_caution' => 'danger'); $meta['getGroups'] = array(''); -$meta['getUsers'] = array(''); -$meta['FilterLogin'] = array('string'); -$meta['FilterName'] = array('string'); -$meta['FilterEmail'] = array('string'); -$meta['FilterGroup'] = array('string'); -$meta['SortOrder'] = array('string'); -$meta['addUser'] = array(''); -$meta['addGroup'] = array(''); -$meta['addUserGroup'] = array(''); -$meta['delGroup'] = array(''); -$meta['getUserID'] = array(''); -$meta['delUser'] = array(''); -$meta['delUserRefs'] = array(''); -$meta['updateUser'] = array('string'); -$meta['UpdateLogin'] = array('string'); -$meta['UpdatePass'] = array('string'); -$meta['UpdateEmail'] = array('string'); -$meta['UpdateName'] = array('string'); -$meta['UpdateTarget'] = array('string'); -$meta['delUserGroup'] = array(''); -$meta['getGroupID'] = array(''); \ No newline at end of file +$meta['getUsers'] = array('','_caution' => 'danger'); +$meta['FilterLogin'] = array('string','_caution' => 'danger'); +$meta['FilterName'] = array('string','_caution' => 'danger'); +$meta['FilterEmail'] = array('string','_caution' => 'danger'); +$meta['FilterGroup'] = array('string','_caution' => 'danger'); +$meta['SortOrder'] = array('string','_caution' => 'danger'); +$meta['addUser'] = array('','_caution' => 'danger'); +$meta['addGroup'] = array('','_caution' => 'danger'); +$meta['addUserGroup'] = array('','_caution' => 'danger'); +$meta['delGroup'] = array('','_caution' => 'danger'); +$meta['getUserID'] = array('','_caution' => 'danger'); +$meta['delUser'] = array('','_caution' => 'danger'); +$meta['delUserRefs'] = array('','_caution' => 'danger'); +$meta['updateUser'] = array('string','_caution' => 'danger'); +$meta['UpdateLogin'] = array('string','_caution' => 'danger'); +$meta['UpdatePass'] = array('string','_caution' => 'danger'); +$meta['UpdateEmail'] = array('string','_caution' => 'danger'); +$meta['UpdateName'] = array('string','_caution' => 'danger'); +$meta['UpdateTarget'] = array('string','_caution' => 'danger'); +$meta['delUserGroup'] = array('','_caution' => 'danger'); +$meta['getGroupID'] = array('','_caution' => 'danger'); \ No newline at end of file -- cgit v1.2.3 From efcec72bb2994a220c7885c5b6855a934e80b52d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 18:06:54 +0200 Subject: convert from iso-8859-1 if not utf8 --- lib/plugins/usermanager/admin.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 395b91053..4c555ba67 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -759,6 +759,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $fd = fopen($_FILES['import']['tmp_name'],'r'); if ($fd) { while($csv = fgets($fd)){ + if (!utf8_check($csv)) { + $csv = utf8_encode($csv); + } $raw = str_getcsv($csv); $error = ''; // clean out any errors from the previous line // data checks... -- cgit v1.2.3 From bed4ab799d58cd04a3fabc7355084181da86e843 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 18:09:35 +0200 Subject: change 'debug' setting to 'security' (rather than 'danger') --- lib/plugins/authad/conf/metadata.php | 2 +- lib/plugins/authldap/conf/metadata.php | 2 +- lib/plugins/authmysql/conf/metadata.php | 2 +- lib/plugins/authpgsql/conf/metadata.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php index 29f9a5ae9..7b4f895d0 100644 --- a/lib/plugins/authad/conf/metadata.php +++ b/lib/plugins/authad/conf/metadata.php @@ -9,6 +9,6 @@ $meta['admin_password'] = array('password','_caution' => 'danger'); $meta['real_primarygroup'] = array('onoff','_caution' => 'danger'); $meta['use_ssl'] = array('onoff','_caution' => 'danger'); $meta['use_tls'] = array('onoff','_caution' => 'danger'); -$meta['debug'] = array('onoff','_caution' => 'danger'); +$meta['debug'] = array('onoff','_caution' => 'security'); $meta['expirywarn'] = array('numeric', '_min'=>0,'_caution' => 'danger'); $meta['additional'] = array('string','_caution' => 'danger'); diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php index a165a322c..6aa53c40d 100644 --- a/lib/plugins/authldap/conf/metadata.php +++ b/lib/plugins/authldap/conf/metadata.php @@ -16,4 +16,4 @@ $meta['bindpw'] = array('password','_caution' => 'danger'); $meta['userscope'] = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger'); $meta['groupscope'] = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger'); $meta['groupkey'] = array('string','_caution' => 'danger'); -$meta['debug'] = array('onoff','_caution' => 'danger'); \ No newline at end of file +$meta['debug'] = array('onoff','_caution' => 'security'); \ No newline at end of file diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php index 73e9ec1a8..54d6f1404 100644 --- a/lib/plugins/authmysql/conf/metadata.php +++ b/lib/plugins/authmysql/conf/metadata.php @@ -5,7 +5,7 @@ $meta['user'] = array('string','_caution' => 'danger'); $meta['password'] = array('password','_caution' => 'danger'); $meta['database'] = array('string','_caution' => 'danger'); $meta['charset'] = array('string','_caution' => 'danger'); -$meta['debug'] = array('multichoice','_choices' => array(0,1,2),'_caution' => 'danger'); +$meta['debug'] = array('multichoice','_choices' => array(0,1,2),'_caution' => 'security'); $meta['forwardClearPass'] = array('onoff','_caution' => 'danger'); $meta['TablesToLock'] = array('array','_caution' => 'danger'); $meta['checkPass'] = array('','_caution' => 'danger'); diff --git a/lib/plugins/authpgsql/conf/metadata.php b/lib/plugins/authpgsql/conf/metadata.php index 9868cf9b5..fbd051270 100644 --- a/lib/plugins/authpgsql/conf/metadata.php +++ b/lib/plugins/authpgsql/conf/metadata.php @@ -5,7 +5,7 @@ $meta['port'] = array('numeric','_caution' => 'danger'); $meta['user'] = array('string','_caution' => 'danger'); $meta['password'] = array('password','_caution' => 'danger'); $meta['database'] = array('string','_caution' => 'danger'); -$meta['debug'] = array('onoff','_caution' => 'danger'); +$meta['debug'] = array('onoff','_caution' => 'security'); $meta['forwardClearPass'] = array('onoff','_caution' => 'danger'); $meta['checkPass'] = array('','_caution' => 'danger'); $meta['getUserInfo'] = array('','_caution' => 'danger'); -- cgit v1.2.3 From 5d92c7d222f614c23229a455bc6738bbaaf0a6ce Mon Sep 17 00:00:00 2001 From: mprins Date: Sun, 4 Aug 2013 10:50:57 +0200 Subject: translation update --- lib/plugins/acl/lang/nl/lang.php | 4 ++-- lib/plugins/authad/lang/nl/settings.php | 5 +++-- lib/plugins/authldap/lang/nl/settings.php | 5 +++-- lib/plugins/authmysql/lang/nl/settings.php | 5 +++-- lib/plugins/authpgsql/lang/nl/settings.php | 5 +++-- lib/plugins/plugin/lang/nl/lang.php | 5 +++-- lib/plugins/popularity/lang/nl/lang.php | 5 +++-- lib/plugins/revert/lang/nl/lang.php | 5 +++-- lib/plugins/usermanager/lang/nl/lang.php | 5 +++-- 9 files changed, 26 insertions(+), 18 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index 567eb46dc..e3a95e779 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -1,8 +1,8 @@ * @author Jack van Klaren * @author Riny Heijdendael diff --git a/lib/plugins/authad/lang/nl/settings.php b/lib/plugins/authad/lang/nl/settings.php index 933566d18..8f5c84043 100644 --- a/lib/plugins/authad/lang/nl/settings.php +++ b/lib/plugins/authad/lang/nl/settings.php @@ -1,7 +1,8 @@ @mijn.domein.org'; $lang['base_dn'] = 'Je basis DN. Bijv. DC=mijn,DC=domein,DC=org'; diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php index 274c3b7fc..958bd4d6f 100644 --- a/lib/plugins/authldap/lang/nl/settings.php +++ b/lib/plugins/authldap/lang/nl/settings.php @@ -1,7 +1,8 @@ localhost) of volledige URL (ldap://server.tld:389)'; $lang['port'] = 'LDAP server poort als hiervoor geen volledige URL is opgegeven'; diff --git a/lib/plugins/authmysql/lang/nl/settings.php b/lib/plugins/authmysql/lang/nl/settings.php index dc85b7eee..39fa32112 100644 --- a/lib/plugins/authmysql/lang/nl/settings.php +++ b/lib/plugins/authmysql/lang/nl/settings.php @@ -1,7 +1,8 @@ * @author John de Graaff * @author Niels Schoot diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index b32ad9eb6..dda4a1d7f 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -1,7 +1,8 @@ * @author Niels Schoot * @author Dion Nicolaas diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 0a2880105..882675b81 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -1,7 +1,8 @@ * @author John de Graaff * @author Niels Schoot diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index e960e9a14..e1bf126fb 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -1,7 +1,8 @@ * @author John de Graaff * @author Niels Schoot -- cgit v1.2.3 From 2f46ade0bbc43b599bedf620e2514171cce072df Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 4 Aug 2013 10:58:52 +0200 Subject: FS#2806 - fix auth capability listing in html_debug() --- lib/plugins/auth.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php index ec8ed7e58..dc66d6380 100644 --- a/lib/plugins/auth.php +++ b/lib/plugins/auth.php @@ -54,6 +54,18 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin { // constructors do the real work } + /** + * Available Capabilities. [ DO NOT OVERRIDE ] + * + * For introspection/debugging + * + * @author Christopher Smith + * @return array + */ + public function getCapabilities(){ + return array_keys($this->cando); + } + /** * Capability check. [ DO NOT OVERRIDE ] * -- cgit v1.2.3 From d5808163ba1734a45356b87153595c69205f0756 Mon Sep 17 00:00:00 2001 From: Sven Date: Sun, 4 Aug 2013 16:55:57 +0200 Subject: translation update --- lib/plugins/acl/lang/de/lang.php | 4 ++-- lib/plugins/authad/lang/de/settings.php | 5 +++-- lib/plugins/authldap/lang/de/settings.php | 4 ++-- lib/plugins/authmysql/lang/de/settings.php | 4 ++-- lib/plugins/authpgsql/lang/de/settings.php | 4 ++-- lib/plugins/plugin/lang/de/lang.php | 4 ++-- lib/plugins/popularity/lang/de/lang.php | 5 +++-- lib/plugins/revert/lang/de/lang.php | 5 +++-- lib/plugins/usermanager/lang/de/lang.php | 20 ++++++++++++++++++-- 9 files changed, 37 insertions(+), 18 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 5f3e51a32..77de4b097 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -1,8 +1,8 @@ * @author Christof * @author Anika Henke diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php index f4e86dedd..fd624ad02 100644 --- a/lib/plugins/authad/lang/de/settings.php +++ b/lib/plugins/authad/lang/de/settings.php @@ -1,7 +1,8 @@ * @author Matthias Schulte */ diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php index b237201d8..b24c792f9 100644 --- a/lib/plugins/authldap/lang/de/settings.php +++ b/lib/plugins/authldap/lang/de/settings.php @@ -1,8 +1,8 @@ */ $lang['server'] = 'Adresse zum LDAP-Server. Entweder als Hostname (localhost) oder als FQDN (ldap://server.tld:389).'; diff --git a/lib/plugins/authmysql/lang/de/settings.php b/lib/plugins/authmysql/lang/de/settings.php index 97ba06a9d..90e0ee5a8 100644 --- a/lib/plugins/authmysql/lang/de/settings.php +++ b/lib/plugins/authmysql/lang/de/settings.php @@ -1,8 +1,8 @@ */ $lang['server'] = 'MySQL-Server'; diff --git a/lib/plugins/authpgsql/lang/de/settings.php b/lib/plugins/authpgsql/lang/de/settings.php index 4c80245d6..061f56e45 100644 --- a/lib/plugins/authpgsql/lang/de/settings.php +++ b/lib/plugins/authpgsql/lang/de/settings.php @@ -1,8 +1,8 @@ */ $lang['server'] = 'PostgreSQL-Server'; diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php index 9f26a2933..f41486007 100644 --- a/lib/plugins/plugin/lang/de/lang.php +++ b/lib/plugins/plugin/lang/de/lang.php @@ -1,8 +1,8 @@ * @author Andreas Gohr * @author Michael Klier diff --git a/lib/plugins/popularity/lang/de/lang.php b/lib/plugins/popularity/lang/de/lang.php index 42bdc14d5..a86fce50d 100644 --- a/lib/plugins/popularity/lang/de/lang.php +++ b/lib/plugins/popularity/lang/de/lang.php @@ -1,7 +1,8 @@ * @author Florian Anderiasch * @author Robin Kluth diff --git a/lib/plugins/revert/lang/de/lang.php b/lib/plugins/revert/lang/de/lang.php index 2db065f21..7d0b243bb 100644 --- a/lib/plugins/revert/lang/de/lang.php +++ b/lib/plugins/revert/lang/de/lang.php @@ -1,7 +1,8 @@ * @author Leo Moll * @author Florian Anderiasch diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php index 2b9755de8..68cdf359f 100644 --- a/lib/plugins/usermanager/lang/de/lang.php +++ b/lib/plugins/usermanager/lang/de/lang.php @@ -1,7 +1,8 @@ * @author Andreas Gohr * @author Michael Klier @@ -17,6 +18,7 @@ * @author Paul Lachewsky * @author Pierre Corell * @author Matthias Schulte + * @author Sven */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; @@ -39,6 +41,11 @@ $lang['search'] = 'Suchen'; $lang['search_prompt'] = 'Benutzerdaten filtern'; $lang['clear'] = 'Filter zurücksetzen'; $lang['filter'] = 'Filter'; +$lang['export_all'] = 'Alle User exportieren (CSV)'; +$lang['export_filtered'] = 'Exportiere gefilterte Userliste (CSV)'; +$lang['import'] = 'Importiere neue User'; +$lang['line'] = 'Zeilennr.'; +$lang['error'] = 'Fehlermeldung'; $lang['summary'] = 'Zeige Benutzer %1$d-%2$d von %3$d gefundenen. %4$d Benutzer insgesamt.'; $lang['nonefound'] = 'Keine Benutzer gefunden. %d Benutzer insgesamt.'; $lang['delete_ok'] = '%d Benutzer gelöscht'; @@ -59,3 +66,12 @@ $lang['add_ok'] = 'Nutzer erfolgreich angelegt'; $lang['add_fail'] = 'Nutzer konnte nicht angelegt werden'; $lang['notify_ok'] = 'Benachrichtigungsmail wurde versandt'; $lang['notify_fail'] = 'Benachrichtigungsmail konnte nicht versandt werden'; +$lang['import_success_count'] = 'User-Import: %d User gefunden, %d erfolgreich importiert.'; +$lang['import_failure_count'] = 'User-Import: %d fehlgeschlagen. Fehlgeschlagene User sind nachfolgend aufgelistet.'; +$lang['import_error_fields'] = 'Unzureichende Anzahl an Feldern: %d gefunden, benötigt sind 4.'; +$lang['import_error_baduserid'] = 'User-Id fehlt'; +$lang['import_error_badname'] = 'Ungültiger Name'; +$lang['import_error_badmail'] = 'Ungültige E-Mail'; +$lang['import_error_upload'] = 'Import fehlgeschlagen. Die CSV-Datei konnte nicht hochgeladen werden, oder ist leer.'; +$lang['import_error_readfail'] = 'Import fehlgeschlagen. Die hochgeladene Datei konnte nicht gelesen werden.'; +$lang['import_error_create'] = 'User konnte nicht angelegt werden'; -- cgit v1.2.3 From 72a0f401d75ff021ae5dc3b3739f008ff4220d80 Mon Sep 17 00:00:00 2001 From: Constantinos Xanthopoulos Date: Sun, 4 Aug 2013 21:05:53 +0200 Subject: translation update --- lib/plugins/acl/lang/el/lang.php | 7 ++----- lib/plugins/plugin/lang/el/lang.php | 7 ++----- lib/plugins/popularity/lang/el/lang.php | 5 +++-- lib/plugins/revert/lang/el/lang.php | 8 +++----- lib/plugins/usermanager/lang/el/lang.php | 8 +++----- 5 files changed, 13 insertions(+), 22 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php index 516d7bdf5..dc4a9f034 100644 --- a/lib/plugins/acl/lang/el/lang.php +++ b/lib/plugins/acl/lang/el/lang.php @@ -1,11 +1,8 @@ * @author Anika Henke * @author Matthias Grimm diff --git a/lib/plugins/plugin/lang/el/lang.php b/lib/plugins/plugin/lang/el/lang.php index 4a6f1dbfd..f50e26c46 100644 --- a/lib/plugins/plugin/lang/el/lang.php +++ b/lib/plugins/plugin/lang/el/lang.php @@ -1,11 +1,8 @@ * @author Thanos Massias * @author Αθανάσιος Νταής diff --git a/lib/plugins/popularity/lang/el/lang.php b/lib/plugins/popularity/lang/el/lang.php index 10268a4c3..37a036930 100644 --- a/lib/plugins/popularity/lang/el/lang.php +++ b/lib/plugins/popularity/lang/el/lang.php @@ -1,7 +1,8 @@ * @author George Petsagourakis * @author Petros Vidalis diff --git a/lib/plugins/revert/lang/el/lang.php b/lib/plugins/revert/lang/el/lang.php index c6e8bd56c..4c93ee5a8 100644 --- a/lib/plugins/revert/lang/el/lang.php +++ b/lib/plugins/revert/lang/el/lang.php @@ -1,10 +1,8 @@ * @author Αθανάσιος Νταής * @author Konstantinos Koryllos diff --git a/lib/plugins/usermanager/lang/el/lang.php b/lib/plugins/usermanager/lang/el/lang.php index da7c8fb0f..e14aa615e 100644 --- a/lib/plugins/usermanager/lang/el/lang.php +++ b/lib/plugins/usermanager/lang/el/lang.php @@ -1,10 +1,8 @@ * @author Thanos Massias * @author Αθανάσιος Νταής -- cgit v1.2.3 From c03b461102c569da6cded4ca3c473f5ae149cea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20H=C3=A4rnqvist?= Date: Sun, 4 Aug 2013 23:00:55 +0200 Subject: translation update --- lib/plugins/authldap/lang/sv/settings.php | 2 ++ lib/plugins/revert/lang/sv/lang.php | 1 + lib/plugins/usermanager/lang/sv/lang.php | 13 +++++++++++++ 3 files changed, 16 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php index 68dbccfd0..d98400461 100644 --- a/lib/plugins/authldap/lang/sv/settings.php +++ b/lib/plugins/authldap/lang/sv/settings.php @@ -4,6 +4,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Smorkster Andersson smorkster@gmail.com + * @author Tor Härnqvist */ $lang['server'] = 'Din LDAO server. Antingen värdnamn (localhost) eller giltig full URL (ldap://server.tld:389)'; $lang['port'] = 'LDAP server port, om det inte angavs full URL ovan'; @@ -12,6 +13,7 @@ $lang['grouptree'] = 'Specificera var grupper finns. T.ex. ou= $lang['userfilter'] = 'LDAP filter för att söka efter användarkonton. T.ex. (&(uid=%{user})(objectClass=posixAccount))'; $lang['groupfilter'] = 'LDAP filter för att söka efter grupper. T.ex. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; $lang['version'] = 'Version av protokoll att använda. Du kan behöva sätta detta till 3'; +$lang['starttls'] = 'Använd TLS-anslutningar'; $lang['bindpw'] = 'Lösenord för användare ovan'; $lang['groupkey'] = 'Gruppmedlemskap från något användarattribut (istället för standard AD grupp) t.ex. grupp från avdelning eller telefonnummer'; $lang['debug'] = 'Visa ytterligare felsökningsinformation vid fel'; diff --git a/lib/plugins/revert/lang/sv/lang.php b/lib/plugins/revert/lang/sv/lang.php index 4a5b944f6..c30f82d93 100644 --- a/lib/plugins/revert/lang/sv/lang.php +++ b/lib/plugins/revert/lang/sv/lang.php @@ -17,6 +17,7 @@ * @author mikael@mallander.net * @author Smorkster Andersson smorkster@gmail.com * @author Henrik + * @author Tor Härnqvist */ $lang['menu'] = 'Hantera återställningar'; $lang['filter'] = 'Sök efter spamsidor'; diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php index 68f5bbc31..340886578 100644 --- a/lib/plugins/usermanager/lang/sv/lang.php +++ b/lib/plugins/usermanager/lang/sv/lang.php @@ -16,6 +16,7 @@ * @author Peter Åström * @author mikael@mallander.net * @author Smorkster Andersson smorkster@gmail.com + * @author Tor Härnqvist */ $lang['menu'] = 'Hantera användare'; $lang['noauth'] = '(användarautentisering ej tillgänlig)'; @@ -38,6 +39,10 @@ $lang['search'] = 'Sök'; $lang['search_prompt'] = 'Utför sökning'; $lang['clear'] = 'Återställ sökfilter'; $lang['filter'] = 'Filter'; +$lang['export_all'] = 'Exportera alla användare (CSV)'; +$lang['export_filtered'] = 'Exportera filtrerade användarlistningen (CSV)'; +$lang['import'] = 'Importera nya användare'; +$lang['error'] = 'Error-meddelande'; $lang['summary'] = 'Visar användare %1$d-%2$d av %3$d funna. %4$d användare totalt.'; $lang['nonefound'] = 'Inga användare hittades. %d användare totalt.'; $lang['delete_ok'] = '%d användare raderade'; @@ -58,3 +63,11 @@ $lang['add_ok'] = 'Användaren tillagd'; $lang['add_fail'] = 'Användare kunde inte läggas till'; $lang['notify_ok'] = 'E-postmeddelande skickat'; $lang['notify_fail'] = 'E-postmeddelande kunde inte skickas'; +$lang['import_success_count'] = 'Användar-import: %d användare funna, %d importerade framgångsrikt.'; +$lang['import_failure_count'] = 'Användar-import: %d misslyckades. Misslyckandena listas nedan.'; +$lang['import_error_baduserid'] = 'Användar-id saknas'; +$lang['import_error_badname'] = 'Felaktigt namn'; +$lang['import_error_badmail'] = 'Felaktig e-postadress'; +$lang['import_error_upload'] = 'Import misslyckades. Csv-filen kunde inte laddas upp eller är tom.'; +$lang['import_error_readfail'] = 'Import misslyckades. Den uppladdade filen gick inte att läsa.'; +$lang['import_error_create'] = 'Misslyckades att skapa användaren.'; -- cgit v1.2.3 From 024914eb509865786ac98b9999cffacb1ebeaeb6 Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 5 Aug 2013 07:55:56 +0200 Subject: translation update --- lib/plugins/acl/lang/ru/lang.php | 4 ++-- lib/plugins/authmysql/lang/ru/settings.php | 5 +++-- lib/plugins/plugin/lang/ru/lang.php | 4 ++-- lib/plugins/popularity/lang/ru/lang.php | 5 +++-- lib/plugins/revert/lang/ru/lang.php | 4 +++- lib/plugins/usermanager/lang/ru/import.txt | 9 +++++++++ lib/plugins/usermanager/lang/ru/lang.php | 20 ++++++++++++++++++-- 7 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 lib/plugins/usermanager/lang/ru/import.txt (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 2501c00e2..f042ab724 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -1,8 +1,8 @@ * @author Змей Этерийский evil_snake@eternion.ru * @author Hikaru Nakajima diff --git a/lib/plugins/authmysql/lang/ru/settings.php b/lib/plugins/authmysql/lang/ru/settings.php index 066598331..23fd349af 100644 --- a/lib/plugins/authmysql/lang/ru/settings.php +++ b/lib/plugins/authmysql/lang/ru/settings.php @@ -1,7 +1,8 @@ * @author Andrew Pleshakov * @author Змей Этерийский evil_snake@eternion.ru diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php index a7f33156f..9c03ccda6 100644 --- a/lib/plugins/popularity/lang/ru/lang.php +++ b/lib/plugins/popularity/lang/ru/lang.php @@ -1,7 +1,8 @@ * @author Alexei Tereschenko diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php index 817bd1064..defd86de0 100644 --- a/lib/plugins/revert/lang/ru/lang.php +++ b/lib/plugins/revert/lang/ru/lang.php @@ -1,6 +1,8 @@ * @author Andrew Pleshakov * @author Змей Этерийский evil_snake@eternion.ru diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt new file mode 100644 index 000000000..271a9b177 --- /dev/null +++ b/lib/plugins/usermanager/lang/ru/import.txt @@ -0,0 +1,9 @@ +===== Импорт нескольких пользователей ===== + +Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. +Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. +Поля CSV должны быть отделены запятой (,) а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание. +В качестве примера можете взять список пользователей, экспортированный через "Экспорт пользователей". +Повторяющиеся идентификаторы user-id будут игнорироваться. + +Парол доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю. \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 29cee6576..f2029e58b 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -1,8 +1,8 @@ * @author Andrew Pleshakov * @author Змей Этерийский evil_snake@eternion.ru @@ -18,6 +18,7 @@ * @author Eugene * @author Johnny Utah * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua) + * @author Pavel */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; @@ -40,6 +41,11 @@ $lang['search'] = 'Поиск'; $lang['search_prompt'] = 'Искать'; $lang['clear'] = 'Сброс фильтра поиска'; $lang['filter'] = 'Фильтр'; +$lang['export_all'] = 'Экспорт всех пользователей (CSV)'; +$lang['export_filtered'] = 'Экспорт пользователей с фильтрацией списка (CSV)'; +$lang['import'] = 'Импорт новых пользователей'; +$lang['line'] = 'Строка №.'; +$lang['error'] = 'Ошибка'; $lang['summary'] = 'Показаны пользователи %1$d-%2$d из %3$d найденных. Всего пользователей: %4$d.'; $lang['nonefound'] = 'Не найдено ни одного пользователя. Всего пользователей: %d.'; $lang['delete_ok'] = 'Удалено пользователей: %d'; @@ -60,3 +66,13 @@ $lang['add_ok'] = 'Пользователь успешно доб $lang['add_fail'] = 'Не удалось добавить пользователя'; $lang['notify_ok'] = 'Письмо с уведомлением отправлено'; $lang['notify_fail'] = 'Не удалось отправить письмо с уведомлением'; +$lang['import_success_count'] = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.'; +$lang['import_failure_count'] = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.'; +$lang['import_error_fields'] = 'Не все поля заполнены. Найдено %d, а нужно 4.'; +$lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя'; +$lang['import_error_badname'] = 'Имя не годится'; +$lang['import_error_badmail'] = 'Адрес электронной почты не годится'; +$lang['import_error_upload'] = 'Импорт не удался. CSV файл не загружен или пуст.'; +$lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.'; +$lang['import_error_create'] = 'Невозможно создать пользователя'; +$lang['import_notify_fail'] = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.'; -- cgit v1.2.3 From 544130397f3b68808f74d98f8681a07448c25899 Mon Sep 17 00:00:00 2001 From: tsangho Date: Mon, 5 Aug 2013 20:15:57 +0200 Subject: translation update --- lib/plugins/acl/lang/zh-tw/lang.php | 4 ++-- lib/plugins/authad/lang/zh-tw/settings.php | 5 +++-- lib/plugins/authldap/lang/zh-tw/settings.php | 5 +++-- lib/plugins/authmysql/lang/zh-tw/settings.php | 5 +++-- lib/plugins/authpgsql/lang/zh-tw/settings.php | 5 +++-- lib/plugins/plugin/lang/zh-tw/lang.php | 5 +++-- lib/plugins/popularity/lang/zh-tw/lang.php | 5 +++-- lib/plugins/revert/lang/zh-tw/lang.php | 5 +++-- lib/plugins/usermanager/lang/zh-tw/lang.php | 9 +++++++-- 9 files changed, 30 insertions(+), 18 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php index ff2c6a184..a56435318 100644 --- a/lib/plugins/acl/lang/zh-tw/lang.php +++ b/lib/plugins/acl/lang/zh-tw/lang.php @@ -1,8 +1,8 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php index c46e5f96f..bd5d9413a 100644 --- a/lib/plugins/authad/lang/zh-tw/settings.php +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ @my.domain.org'; diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php index e93190516..d2513eeff 100644 --- a/lib/plugins/authldap/lang/zh-tw/settings.php +++ b/lib/plugins/authldap/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ localhost) 或完整的 URL (ldap://server.tld:389)'; diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php index 95d068150..3fbee151c 100644 --- a/lib/plugins/authmysql/lang/zh-tw/settings.php +++ b/lib/plugins/authmysql/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php index b34efe995..252c606a9 100644 --- a/lib/plugins/popularity/lang/zh-tw/lang.php +++ b/lib/plugins/popularity/lang/zh-tw/lang.php @@ -1,7 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php index 88a77f7a1..4ff1d102a 100644 --- a/lib/plugins/revert/lang/zh-tw/lang.php +++ b/lib/plugins/revert/lang/zh-tw/lang.php @@ -1,7 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php index 980d974cc..c7126bd1a 100644 --- a/lib/plugins/usermanager/lang/zh-tw/lang.php +++ b/lib/plugins/usermanager/lang/zh-tw/lang.php @@ -1,7 +1,8 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html @@ -12,6 +13,7 @@ * @author Shuo-Ting Jian * @author syaoranhinata@gmail.com * @author Ichirou Uchiki + * @author tsangho */ $lang['menu'] = '帳號管理器'; $lang['noauth'] = '(帳號認證尚未開放)'; @@ -34,6 +36,8 @@ $lang['search'] = '搜尋'; $lang['search_prompt'] = '開始搜尋'; $lang['clear'] = '重設篩選條件'; $lang['filter'] = '篩選條件 (Filter)'; +$lang['import'] = '匯入新的用戶'; +$lang['error'] = '錯誤訊息'; $lang['summary'] = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。'; $lang['nonefound'] = '找不到帳號。共有 %d 個帳號。'; $lang['delete_ok'] = '已刪除 %d 個帳號'; @@ -54,3 +58,4 @@ $lang['add_ok'] = '已新增使用者'; $lang['add_fail'] = '無法新增使用者'; $lang['notify_ok'] = '通知信已寄出'; $lang['notify_fail'] = '通知信無法寄出'; +$lang['import_error_readfail'] = '會入錯誤，無法讀取已經上傳的檔案'; -- cgit v1.2.3 From f829a311ed69ff8e4de0673517ca191be36dab4a Mon Sep 17 00:00:00 2001 From: Edmondo Di Tucci Date: Mon, 5 Aug 2013 21:26:34 +0200 Subject: translation update --- lib/plugins/acl/lang/it/lang.php | 4 ++-- lib/plugins/authad/lang/it/settings.php | 9 +++++++-- lib/plugins/plugin/lang/it/lang.php | 4 ++-- lib/plugins/popularity/lang/it/lang.php | 5 +++-- lib/plugins/revert/lang/it/lang.php | 5 +++-- lib/plugins/usermanager/lang/it/lang.php | 5 +++-- 6 files changed, 20 insertions(+), 12 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php index 07e86697d..ba2d0fd32 100644 --- a/lib/plugins/acl/lang/it/lang.php +++ b/lib/plugins/acl/lang/it/lang.php @@ -1,8 +1,8 @@ * @author Roberto Bolli * @author Pietro Battiston toobaz@email.it diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php index 10ae72f87..48276af19 100644 --- a/lib/plugins/authad/lang/it/settings.php +++ b/lib/plugins/authad/lang/it/settings.php @@ -1,5 +1,10 @@ */ +$lang['domain_controllers'] = 'Elenco separato da virgole di Domain Controllers. Eg. srv1.domain.org,srv2.domain.org'; +$lang['admin_username'] = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.'; +$lang['admin_password'] = 'La password dell\'utente soprascritto.'; diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php index 9ae55c5de..186bf976e 100644 --- a/lib/plugins/plugin/lang/it/lang.php +++ b/lib/plugins/plugin/lang/it/lang.php @@ -1,8 +1,8 @@ * @author Silvia Sargentoni * @author Pietro Battiston toobaz@email.it diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php index a0cf274aa..9edefba84 100644 --- a/lib/plugins/popularity/lang/it/lang.php +++ b/lib/plugins/popularity/lang/it/lang.php @@ -1,7 +1,8 @@ diff --git a/lib/plugins/revert/lang/it/lang.php b/lib/plugins/revert/lang/it/lang.php index 9c092de99..d2f7b6d6a 100644 --- a/lib/plugins/revert/lang/it/lang.php +++ b/lib/plugins/revert/lang/it/lang.php @@ -1,7 +1,8 @@ * @author Silvia Sargentoni * @author Pietro Battiston toobaz@email.it -- cgit v1.2.3 From 7e45525650fd98a7cfd14c3484eb5add715c24a5 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Aug 2013 09:11:09 +0200 Subject: translation update --- lib/plugins/acl/lang/zh/lang.php | 4 ++-- lib/plugins/authad/lang/zh/settings.php | 5 +++-- lib/plugins/authldap/lang/zh/settings.php | 5 +++-- lib/plugins/authmysql/lang/zh/settings.php | 5 +++-- lib/plugins/authpgsql/lang/zh/settings.php | 5 +++-- lib/plugins/plugin/lang/zh/lang.php | 4 ++-- lib/plugins/popularity/lang/zh/lang.php | 5 +++-- lib/plugins/revert/lang/zh/lang.php | 4 ++-- lib/plugins/usermanager/lang/zh/lang.php | 13 +++++++++++-- 9 files changed, 32 insertions(+), 18 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 983882eaf..029446cca 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -1,8 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php index 0ad8d4e4f..84bdc1e5c 100644 --- a/lib/plugins/authad/lang/zh/settings.php +++ b/lib/plugins/authad/lang/zh/settings.php @@ -1,7 +1,8 @@ */ $lang['account_suffix'] = '您的账户后缀。例如 @my.domain.org'; diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php index 3f38deae9..b531c192a 100644 --- a/lib/plugins/authldap/lang/zh/settings.php +++ b/lib/plugins/authldap/lang/zh/settings.php @@ -1,7 +1,8 @@ */ $lang['server'] = '您的 LDAP 服务器。填写主机名 (localhost) 或者完整的 URL (ldap://server.tld:389)'; diff --git a/lib/plugins/authmysql/lang/zh/settings.php b/lib/plugins/authmysql/lang/zh/settings.php index 772f75ecd..b58159e85 100644 --- a/lib/plugins/authmysql/lang/zh/settings.php +++ b/lib/plugins/authmysql/lang/zh/settings.php @@ -1,7 +1,8 @@ */ $lang['server'] = '您的 MySQL 服务器'; diff --git a/lib/plugins/authpgsql/lang/zh/settings.php b/lib/plugins/authpgsql/lang/zh/settings.php index dc7223d89..32adb37d9 100644 --- a/lib/plugins/authpgsql/lang/zh/settings.php +++ b/lib/plugins/authpgsql/lang/zh/settings.php @@ -1,7 +1,8 @@ */ $lang['server'] = '您的 PostgreSQL 服务器'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 473d31ead..f69410503 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -1,8 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index 9c916c2a5..532abb890 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -1,7 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index d4d010f29..44a72f54b 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -1,8 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index e7a228229..2674983b2 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -1,7 +1,8 @@ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com @@ -14,6 +15,7 @@ * @author caii, patent agent in China * @author lainme993@gmail.com * @author Shuo-Ting Jian + * @author Rachel */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '（用户认证不可用）'; @@ -36,6 +38,9 @@ $lang['search'] = '搜索'; $lang['search_prompt'] = '进行搜索'; $lang['clear'] = '重置搜索过滤器'; $lang['filter'] = '过滤器'; +$lang['import'] = '请输入新用户名'; +$lang['line'] = '行号'; +$lang['error'] = '信息错误'; $lang['summary'] = '找到 %3$d 名用户，显示其中第 %1$d 至 %2$d 位用户。数据库中共有 %4$d 名用户。'; $lang['nonefound'] = '没有找到用户。数据库中共有 %d 名用户。'; $lang['delete_ok'] = '用户 %d 已删除'; @@ -56,3 +61,7 @@ $lang['add_ok'] = '用户添加成功'; $lang['add_fail'] = '用户添加失败'; $lang['notify_ok'] = '通知邮件已发送'; $lang['notify_fail'] = '通知邮件无法发送'; +$lang['import_error_baduserid'] = '用户ID丢失'; +$lang['import_error_badname'] = '名称错误'; +$lang['import_error_badmail'] = '邮件地址错误'; +$lang['import_error_create'] = '不能创建新用户'; -- cgit v1.2.3 From 9646a812f0f8451f1931e0fb702576c94560475e Mon Sep 17 00:00:00 2001 From: Edmondo Di Tucci Date: Thu, 8 Aug 2013 15:10:56 +0200 Subject: translation update --- lib/plugins/authad/lang/it/settings.php | 8 ++++++++ lib/plugins/authldap/lang/it/settings.php | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php index 48276af19..2d68dad68 100644 --- a/lib/plugins/authad/lang/it/settings.php +++ b/lib/plugins/authad/lang/it/settings.php @@ -5,6 +5,14 @@ * * @author Edmondo Di Tucci */ +$lang['account_suffix'] = 'Il suffisso del tuo account. Eg. @my.domain.org'; +$lang['base_dn'] = 'Il tuo DN. base Eg. DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = 'Elenco separato da virgole di Domain Controllers. Eg. srv1.domain.org,srv2.domain.org'; $lang['admin_username'] = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.'; $lang['admin_password'] = 'La password dell\'utente soprascritto.'; +$lang['sso'] = 'Deve essere usato Single-Sign-On via Kerberos oppure NTLM?'; +$lang['use_ssl'] = 'Usare la connessione SSL? Se usata, non abilitare TSL qui sotto.'; +$lang['use_tls'] = 'Usare la connessione TSL? Se usata, non abilitare SSL qui sopra.'; +$lang['debug'] = 'Visualizzare output addizionale di debug per gli errori?'; +$lang['expirywarn'] = 'Giorni di preavviso per la scadenza della password dell\'utente. 0 per disabilitare.'; +$lang['additional'] = 'Valori separati da virgola di attributi AD addizionali da caricare dai dati utente. Usato da alcuni plugin.'; diff --git a/lib/plugins/authldap/lang/it/settings.php b/lib/plugins/authldap/lang/it/settings.php index 10ae72f87..023159489 100644 --- a/lib/plugins/authldap/lang/it/settings.php +++ b/lib/plugins/authldap/lang/it/settings.php @@ -1,5 +1,15 @@ */ +$lang['server'] = 'Il tuo server LDAP. Inserire o l\'hostname (localhost) oppure un URL completo (ldap://server.tld:389)'; +$lang['port'] = 'Porta del server LDAP se non è stato fornito un URL completo più sopra.'; +$lang['usertree'] = 'Dove cercare l\'account utente. Eg. ou=People, dc=server, dc=tld'; +$lang['grouptree'] = 'Dove cercare i gruppi utente. Eg. ou=Group, dc=server, dc=tld'; +$lang['userfilter'] = 'Filtro per cercare l\'account utente LDAP. Eg. (&(uid=%{user})(objectClass=posixAccount))'; +$lang['groupfilter'] = 'Filtro per cercare i gruppi LDAP. Eg. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; +$lang['version'] = 'Versione protocollo da usare. Pu3'; +$lang['starttls'] = 'Usare la connessione TSL?'; -- cgit v1.2.3 From dba5f66fc1f3f8bd61cdda736dd1a2d00b628164 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 8 Aug 2013 20:15:57 +0200 Subject: translation update --- lib/plugins/acl/lang/fr/lang.php | 4 ++-- lib/plugins/authad/lang/fr/settings.php | 5 +++-- lib/plugins/authldap/lang/fr/settings.php | 5 +++-- lib/plugins/authmysql/lang/fr/settings.php | 5 +++-- lib/plugins/authpgsql/lang/fr/settings.php | 5 +++-- lib/plugins/plugin/lang/fr/lang.php | 4 ++-- lib/plugins/popularity/lang/fr/lang.php | 5 +++-- lib/plugins/revert/lang/fr/lang.php | 4 +++- lib/plugins/usermanager/lang/fr/lang.php | 5 +++-- 9 files changed, 25 insertions(+), 17 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 538dd14d3..dc17cf79e 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -1,8 +1,8 @@ * @author Antoine Fixary * @author cumulus diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php index 5480a3d44..d05390efc 100644 --- a/lib/plugins/authad/lang/fr/settings.php +++ b/lib/plugins/authad/lang/fr/settings.php @@ -1,7 +1,8 @@ */ $lang['account_suffix'] = 'Le suffixe de votre compte. Ex.: @mon.domaine.org'; diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php index 3df09eb7c..607eed24d 100644 --- a/lib/plugins/authldap/lang/fr/settings.php +++ b/lib/plugins/authldap/lang/fr/settings.php @@ -1,7 +1,8 @@ */ $lang['server'] = 'Votre serveur LDAP. Soit le nom d\'hôte (localhost) ou l\'URL complète (ldap://serveur.dom:389)'; diff --git a/lib/plugins/authmysql/lang/fr/settings.php b/lib/plugins/authmysql/lang/fr/settings.php index dfb79b545..d69c8d41c 100644 --- a/lib/plugins/authmysql/lang/fr/settings.php +++ b/lib/plugins/authmysql/lang/fr/settings.php @@ -1,7 +1,8 @@ */ $lang['server'] = 'Votre serveur MySQL'; diff --git a/lib/plugins/authpgsql/lang/fr/settings.php b/lib/plugins/authpgsql/lang/fr/settings.php index ec425bd49..9e471075a 100644 --- a/lib/plugins/authpgsql/lang/fr/settings.php +++ b/lib/plugins/authpgsql/lang/fr/settings.php @@ -1,7 +1,8 @@ */ $lang['server'] = 'Votre serveur PostgreSQL'; diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index 2926225ed..0592f3c7d 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -1,8 +1,8 @@ * @author Delassaux Julien * @author Maurice A. LeBlanc diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index b7e053197..7603b2a08 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -1,7 +1,8 @@ * @author stephane.gully@gmail.com * @author Guillaume Turri diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index a063c8996..4ba6c19a7 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -1,6 +1,8 @@ * @author Maurice A. LeBlanc * @author Guy Brand diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 40e878bbb..2ff1bd7a0 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -1,7 +1,8 @@ * @author Delassaux Julien * @author Maurice A. LeBlanc -- cgit v1.2.3 From 931cef44059fa4b9a596d9247048388310313009 Mon Sep 17 00:00:00 2001 From: Egor Smkv Date: Thu, 8 Aug 2013 20:20:53 +0200 Subject: translation update --- lib/plugins/acl/lang/uk/lang.php | 4 ++-- lib/plugins/plugin/lang/uk/lang.php | 4 ++-- lib/plugins/popularity/lang/uk/lang.php | 5 +++-- lib/plugins/revert/lang/uk/lang.php | 5 +++-- lib/plugins/usermanager/lang/uk/lang.php | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/uk/lang.php b/lib/plugins/acl/lang/uk/lang.php index 99b4b2623..97c66d8a2 100644 --- a/lib/plugins/acl/lang/uk/lang.php +++ b/lib/plugins/acl/lang/uk/lang.php @@ -1,8 +1,8 @@ * @author serg_stetsuk@ukr.net * @author okunia@gmail.com diff --git a/lib/plugins/plugin/lang/uk/lang.php b/lib/plugins/plugin/lang/uk/lang.php index 036900f4e..c6d5990fc 100644 --- a/lib/plugins/plugin/lang/uk/lang.php +++ b/lib/plugins/plugin/lang/uk/lang.php @@ -1,8 +1,8 @@ diff --git a/lib/plugins/revert/lang/uk/lang.php b/lib/plugins/revert/lang/uk/lang.php index 310f8e8da..2c9774f0c 100644 --- a/lib/plugins/revert/lang/uk/lang.php +++ b/lib/plugins/revert/lang/uk/lang.php @@ -1,7 +1,8 @@ diff --git a/lib/plugins/usermanager/lang/uk/lang.php b/lib/plugins/usermanager/lang/uk/lang.php index 027c94b44..3afb7b7d6 100644 --- a/lib/plugins/usermanager/lang/uk/lang.php +++ b/lib/plugins/usermanager/lang/uk/lang.php @@ -1,8 +1,8 @@ * @author serg_stetsuk@ukr.net * @author okunia@gmail.com -- cgit v1.2.3 From f4399459c78289d4e4d41039094596cd4fff893a Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 10 Aug 2013 13:25:58 +0200 Subject: translation update --- lib/plugins/authldap/lang/nl/settings.php | 6 ++++++ lib/plugins/usermanager/lang/nl/import.txt | 8 ++++++++ lib/plugins/usermanager/lang/nl/lang.php | 16 ++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 lib/plugins/usermanager/lang/nl/import.txt (limited to 'lib/plugins') diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php index 958bd4d6f..b6eed6f38 100644 --- a/lib/plugins/authldap/lang/nl/settings.php +++ b/lib/plugins/authldap/lang/nl/settings.php @@ -3,6 +3,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * + * @author Gerrit Uitslag */ $lang['server'] = 'Je LDAP server. Ofwel servernaam (localhost) of volledige URL (ldap://server.tld:389)'; $lang['port'] = 'LDAP server poort als hiervoor geen volledige URL is opgegeven'; @@ -13,9 +14,14 @@ $lang['groupfilter'] = 'LDAP groepsfilter. Bijv. (&(objectCl $lang['version'] = 'Te gebruiken protocolversie. Je zou het moeten kunnen instellen op 3'; $lang['starttls'] = 'Gebruiken TLS verbindingen'; $lang['referrals'] = 'Moeten verwijzingen worden gevolg'; +$lang['deref'] = 'Hoe moeten de verwijzing van aliases worden bepaald?'; $lang['binddn'] = 'DN van een optionele bind gebruiker als anonieme bind niet genoeg is. Bijv. cn=beheer, dc=mijn, dc=thuis'; $lang['bindpw'] = 'Wachtwoord van bovenstaande gebruiker'; $lang['userscope'] = 'Beperken scope van zoekfuncties voor gebruikers'; $lang['groupscope'] = 'Beperken scope van zoekfuncties voor groepen'; $lang['groupkey'] = 'Groepslidmaatschap van enig gebruikersattribuut (in plaats van standaard AD groepen), bijv. groep van afdeling of telefoonnummer'; $lang['debug'] = 'Tonen van aanvullende debuginformatie bij fouten'; +$lang['deref_o_0'] = 'LDAP_DEREF_NEVER'; +$lang['deref_o_1'] = 'LDAP_DEREF_SEARCHING'; +$lang['deref_o_2'] = 'LDAP_DEREF_FINDING'; +$lang['deref_o_3'] = 'LDAP_DEREF_ALWAYS'; diff --git a/lib/plugins/usermanager/lang/nl/import.txt b/lib/plugins/usermanager/lang/nl/import.txt new file mode 100644 index 000000000..69d2c2306 --- /dev/null +++ b/lib/plugins/usermanager/lang/nl/import.txt @@ -0,0 +1,8 @@ +===== Massa-import van gebruikers ===== + +Hiervoor is een CSV-bestand nodig van de gebruikers met minstens vier kolommen. De kolommen moeten bevatten, in deze volgorde: gebruikers-id, complete naam, e-mailadres en groepen. +Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringt met dubbele aanhalingstekens (""). Backslash (\) kan worden gebruikt om te escapen. +Voor een voorbeeld van een werkend bestand, probeer de "Exporteer Gebruikers" functie hierboven. +Dubbele gebruikers-id's zullen worden genegeerd. + +Een wachtwoord zal worden gegenereerd en gemaild naar elke gebruiker die succesvol is geïmporteerd. \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index e1bf126fb..7be10c16a 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -15,6 +15,7 @@ * @author Jeroen * @author Ricardo Guijt * @author Gerrit + * @author Gerrit Uitslag */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; @@ -37,6 +38,11 @@ $lang['search'] = 'Zoek'; $lang['search_prompt'] = 'Voer zoekopdracht uit'; $lang['clear'] = 'Verwijder zoekfilter'; $lang['filter'] = 'Filter'; +$lang['export_all'] = 'Exporteer Alle Gebruikers (CSV)'; +$lang['export_filtered'] = 'Exporteer de lijst van Gefilterde Gebruikers (CSV)'; +$lang['import'] = 'Importeer Nieuwe Gebruikers'; +$lang['line'] = 'Regelnummer'; +$lang['error'] = 'Foutmelding'; $lang['summary'] = 'Weergegeven gebruikers %1$d-%2$d van %3$d gevonden. %4$d gebruikers in totaal.'; $lang['nonefound'] = 'Geen gebruikers gevonden. %d gebruikers in totaal.'; $lang['delete_ok'] = '%d gebruikers verwijderd'; @@ -57,3 +63,13 @@ $lang['add_ok'] = 'Gebruiker succesvol toegevoegd'; $lang['add_fail'] = 'Gebruiker kon niet worden toegevoegd'; $lang['notify_ok'] = 'Notificatie-e-mail verzonden'; $lang['notify_fail'] = 'Notificatie-e-mail kon niet worden verzonden'; +$lang['import_success_count'] = 'Gebruikers importeren: %d gebruikers gevonden, %d geïmporteerd'; +$lang['import_failure_count'] = 'Gebruikers importeren: %d mislukt. Fouten zijn hieronder weergegeven.'; +$lang['import_error_fields'] = 'Onvoldoende velden, gevonden %d, nodig 4.'; +$lang['import_error_baduserid'] = 'Gebruikers-id mist'; +$lang['import_error_badname'] = 'Verkeerde naam'; +$lang['import_error_badmail'] = 'Verkeerd e-mailadres'; +$lang['import_error_upload'] = 'Importeren mislukt. Het CSV bestand kon niet worden geüpload of is leeg.'; +$lang['import_error_readfail'] = 'Importeren mislukt. Lezen van het geüploade bestand is mislukt.'; +$lang['import_error_create'] = 'Aanmaken van de gebruiker was niet mogelijk.'; +$lang['import_notify_fail'] = 'Notificatiebericht kon niet naar de geïmporteerde gebruiker worden verstuurd, %s met e-mail %s.'; -- cgit v1.2.3 From 1306d063bc48af5df32e884a0a166dc34376b5b3 Mon Sep 17 00:00:00 2001 From: r0sk Date: Sun, 11 Aug 2013 04:15:54 +0200 Subject: translation update --- lib/plugins/acl/lang/es/lang.php | 4 ++-- lib/plugins/plugin/lang/es/lang.php | 4 ++-- lib/plugins/popularity/lang/es/lang.php | 5 +++-- lib/plugins/revert/lang/es/lang.php | 5 +++-- lib/plugins/usermanager/lang/es/lang.php | 5 +++-- 5 files changed, 13 insertions(+), 10 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index b60033e0f..cf503d4d1 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -1,8 +1,8 @@ * @author Oscar M. Lage * @author Gabriel Castillo diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index ded7d7369..0ec39285b 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -1,8 +1,8 @@ * @author Oscar M. Lage * @author Gabriel Castillo diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php index e46735782..337a8ea3a 100644 --- a/lib/plugins/popularity/lang/es/lang.php +++ b/lib/plugins/popularity/lang/es/lang.php @@ -1,7 +1,8 @@ * @author Manuel Meco diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php index 129d71574..599ffe021 100644 --- a/lib/plugins/revert/lang/es/lang.php +++ b/lib/plugins/revert/lang/es/lang.php @@ -1,7 +1,8 @@ * @author Gabriel Castillo * @author oliver@samera.com.py diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index 521191701..26e4200e4 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -1,7 +1,8 @@ * @author Oscar M. Lage * @author Gabriel Castillo -- cgit v1.2.3