From 4dbf817829c5d66bd5da434062d12a7c33e57d22 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 22 Sep 2014 09:29:00 +0000 Subject: feature 3083: return the upload_file_types in pwg.session.getStatus (list of file extension, comma separated) git-svn-id: http://piwigo.org/svn/trunk@29729 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/ws_functions/pwg.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'include/ws_functions') diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index d94d7a1a8..b96338eaf 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -314,7 +314,7 @@ function ws_session_logout($params, &$service) */ function ws_session_getStatus($params, &$service) { - global $user; + global $user, $conf; $res['username'] = is_a_guest() ? 'guest' : stripslashes($user['username']); foreach ( array('status', 'theme', 'language') as $k ) @@ -327,6 +327,20 @@ function ws_session_getStatus($params, &$service) list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();')); $res['current_datetime'] = $dbnow; $res['version'] = PHPWG_VERSION; + + if (is_admin()) + { + $res['upload_file_types'] = implode( + ',', + array_unique( + array_map( + 'strtolower', + $conf['upload_form_all_types'] ? $conf['file_ext'] : $conf['picture_ext'] + ) + ) + ); + } + return $res; } -- cgit v1.2.3