Attachment #6825 for bug #32888





		options = []
		body = {}
		for iid, ifield in args.iteritems():
			if isinstance(ifield, cherrypy._cpreqbody.Part):
				# field is a FieldStorage object
				store = ifield
				tmpfile = _upload_manager.add(req.id, store)

		def _check_field_storage(iid, ifield):
			# field is a FieldStorage object
			store = ifield
			tmpfile = _upload_manager.add(req.id, store)
					self._log('warn', 'file of size %d could not be uploaded' % (st.st_size))
					raise cherrypy.HTTPError(httplib.BAD_REQUEST, 'The size of the uploaded file is too large')

			# check if filesize is allowed
			st = os.stat(tmpfile)
			max_size = int(configRegistry.get('umc/server/upload/max', 64)) * 1024
			if st.st_size > max_size:
				self._log('warn', 'file of size %d could not be uploaded' % (st.st_size))
				raise cherrypy.HTTPError(httplib.BAD_REQUEST, 'The size of the uploaded file is too large')
					raise cherrypy.HTTPError(httplib.BAD_REQUEST, 'There is not enough free space on disk')

			# check if enough free space is available
			min_size = int(configRegistry.get('umc/server/upload/min_free_space', 51200))  # kilobyte
			s = os.statvfs(tmpfile)
			free_disk_space = s.f_bavail * s.f_frsize / 1024  # kilobyte
			if free_disk_space < min_size:
				self._log('error', 'there is not enough free space to upload files')
				raise cherrypy.HTTPError(httplib.BAD_REQUEST, 'There is not enough free space on disk')

			filename = store.filename
			# some security
			for c in ('<>/'):
				filename = filename.replace(c, '_')

			options.append({'filename': filename, 'name': store.name, 'tmpfile': tmpfile})


		for iid, ifield in args.iteritems():
			if isinstance(ifield, cherrypy._cpreqbody.Part):
				_check_field_storage(iid, ifield)
			elif isinstance(ifield, list):
				for jfield in ifield:
					if isinstance(jfield, cherrypy._cpreqbody.Part):
						_check_field_storage(iid, jfield)
					else:
						# we cannot handle any other type
						CORE.warn('Unknown type of multipart/form entry: %s=%s' % (iid, ifield))
			elif isinstance(ifield, basestring):
				# field is a string :)
				body[iid] = ifield




msgstr ""
"Project-Id-Version: univention-management-console-frontend\n"
"Report-Msgid-Bugs-To: packages@univention.de\n"
"POT-Creation-Date: 2015-04-15 14:34+0200\n"
"PO-Revision-Date: 2013-09-12 11:31+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

"Content-Transfer-Encoding: 8bit\n"

#: umc/tools.js:1577
#, python-brace-format
msgid "\"${moduleName}\" module"
msgstr "Modul \"${moduleName}\""


msgid "%(label)s (retype)"
msgstr "%(label)s (Wiederholung)"

#: umc/widgets/Grid.js:812
#, python-format
msgid "%d entries of %d selected"
msgstr "%d Einträge von %d ausgewählt"

msgid "%s: %s"
msgstr "%s: %s"

#: umc/widgets/Grid.js:817
#, python-format
msgid "1 entry of %d selected"
msgstr "1 Eintrag von %d ausgewählt"

"installation on this system.</p>"
msgstr ""
"<p>Die Lizenz wurde erfolgreich aktualisiert.</p><p>Sie können nun mit dem "
"Einsatz von UMC fortfahren, alle Anwendungen des Univention App Centers "
"stehen dem System nun zur Installation zur Verfügung.</p>"

#: umc/app/FinishedPage.js:44
msgid ""

msgstr ""
"<p>Sie können nun eine gültige E-Mail-Adresse angeben, um das UCS-System für "
"die Verwendung des App Centers freizuschalten. Im nächsten Schritt können "
"Sie die Lizenzdatei hochladen, die an Ihre E-Mail-Adresse gesendet wird.</p>"
"p>"

#: umc/app/HelpPage.js:48
msgid ""

msgid "About UMC"
msgstr "Über UMC"

#: umc/widgets/UnixAccessRights.js:96
#: umc/widgets/UnixAccessRightsExtended.js:96
#: umc/widgets/UnixAccessRights.js:96
msgid "Access"
msgstr "Zugriff"

#: umc/app/ActivationDialog.js:55 umc/app/ActivationPage.js:40
msgid "Activation of Univention Corporate Server"
msgstr "Aktivierung von Univention Corporate Server"


msgid "Back to overview"
msgstr "Zurück zur Übersicht"

#: umc/tools.js:231 umc/app.js:1710 umc/dialog.js:352
#: umc/widgets/MultiObjectSelect.js:137 umc/widgets/Wizard.js:163
msgid "Cancel"
msgstr "Abbrechen"

#: umc/widgets/Uploader.js:113
msgid "Clear data"
msgstr "Daten leeren"


msgid "Fetching information from the server failed!"
msgstr "Das Holen von Informationen vom Server schlug fehl!"

#: umc/widgets/Uploader.js:158
#, python-format
msgid "File cannot be uploaded, its maximum size may be %.1f MB."
msgstr ""
"Die Datei kann nicht hochgeladen werden, ihre Maximalgröße darf %.1f MB "
"nicht überschreiten."

#: umc/widgets/Wizard.js:159
msgid "Finish"
msgstr "Fertigstellen"

msgid "Further Information"
msgstr "Weiterführende Informationen"

#: umc/widgets/UnixAccessRights.js:76
#: umc/widgets/UnixAccessRightsExtended.js:76
#: umc/widgets/UnixAccessRights.js:76
msgid "Group"
msgstr "Gruppe"


msgid "Next"
msgstr "Weiter"

#: umc/widgets/Grid.js:814
msgid "No entries could be found"
msgstr "Es konnten keine Einträge gefunden werden"


msgid "No message"
msgstr "Keine Nachricht"

#: umc/widgets/Grid.js:791
msgid "No object selected"
msgstr "Kein Objekt ausgewählt"

#: umc/widgets/MultiUploader.js:206
msgid "No upload in progress"
msgstr "Keine laufende Dateiübertragung"


msgid "No valid e-mail address."
msgstr "Keine gültige E-Mail-Adresse."

#: umc/dialog.js:164 umc/dialog.js:193 umc/dialog.js:217
#: umc/dialog/NotificationContainer.js:54
#: umc/dialog/NotificationContainer.js:204
#: umc/dialog.js:217
msgid "Notification"
msgstr "Benachrichtigung"


msgid "Open module"
msgstr "Modul öffnen"

#: umc/widgets/UnixAccessRights.js:77
#: umc/widgets/UnixAccessRightsExtended.js:77
#: umc/widgets/UnixAccessRights.js:77
msgid "Others"
msgstr "Andere"

#: umc/widgets/UnixAccessRights.js:75
#: umc/widgets/UnixAccessRightsExtended.js:75
#: umc/widgets/UnixAccessRights.js:75
msgid "Owner"
msgstr "Besitzer"


"Bitte nehmen Sie sich einen Augenblick Zeit, um die folgenden Informationen "
"bereitzustellen:"

#: umc/widgets/UnixAccessRights.js:88
#: umc/widgets/UnixAccessRightsExtended.js:88
#: umc/widgets/UnixAccessRights.js:88
msgid "Read"
msgstr "Lesen"


msgid "Reload"
msgstr "Neu laden"

#: umc/widgets/MultiObjectSelect.js:287 umc/widgets/MultiUploader.js:126
msgid "Remove"
msgstr "Entfernen"


"probiert."

#: umc/tools.js:313
#, python-brace-format
msgid ""
"So far, the connection to the server could not be established after {time} "
"seconds. This can be a normal behavior. In any case, the process will "

"Die Aktivierung des UCS-Systems schlug fehl. Bitte wiederholen Sie den "
"Aktivierungsvorgang über das Benutzermenü oben rechts."

#: umc/widgets/Uploader.js:169
#, python-format
msgid ""
"The following Files cannot be uploaded because they exceed the maximum file "
"size: %s The maximum size of a file is %.1f MB."
msgstr ""
"Die folgenden Dateien können nicht hochgeladen werden, da sie die maximale "
"Dateigröße überschreiten: %s Die maximale Größe einer Datei ist %.1f MB."

#: umc/app/StartupDialog.js:132 umc/app/ActivationDialog.js:147
msgid ""
"The import of the license failed. Check the integrity of the original file "

msgid "The password has expired and must be changed."
msgstr "Das Passwort ist abgelaufen und muss geändert werden."

#: umc/widgets/PasswordInputBox.js:122 umc/dialog/LoginDialog.js:226
msgid "The passwords do not match, please retype again."
msgstr "Die Passwörter stimmen nicht überein. Bitte versuchen Sie es erneut."


msgid "Updating session data..."
msgstr "Aktualisieren der Sitzungsdaten..."

#: umc/widgets/Uploader.js:112 umc/widgets/InfoUploader.js:43
#: umc/widgets/MultiUploader.js:107
msgid "Upload"
msgstr "Hochladen"


msgid "Upload new image"
msgstr "Neues Bild hochladen"

#: umc/widgets/Uploader.js:277
msgid "Uploading..."
msgstr "Datenübertragung..."

#: umc/widgets/MultiUploader.js:226
#, python-format
msgid "Uploading... %d of %d files remaining."
msgstr "Dateiübertragung... %d von %d Dateien verbleiben"

#: umc/widgets/MultiUploader.js:223
msgid "Uploads finished"
msgstr "Dateiübertragung beendet"


msgid "Welcome to Univention Management Console"
msgstr "Willkommen bei Univention Management Console"

#: umc/widgets/UnixAccessRights.js:92
#: umc/widgets/UnixAccessRightsExtended.js:92
#: umc/widgets/UnixAccessRights.js:92
msgid "Write"
msgstr "Schreiben"


msgid "expected result"
msgstr "erwartetes Ergebnis"

#: umc/widgets/Grid.js:591
msgid "more"
msgstr "mehr"


msgid "steps to reproduce the failure"
msgstr "Schritte, um den Fehler zu reproduzieren"

#: umc/app.js:901 umc/app/WelcomePage.js:78
msgid "umcFeedbackUrl"
msgstr "https://www.univention.de/produkt-feedback/"


msgstr "http://www.univention.de"

#: umc/widgets/ProgressBar.js:176
#, python-brace-format
msgid "{number} errors occurred: "
msgstr "{number} Fehler sind aufgetreten: "


#~ msgid "Favorites"
#~ msgstr "Favoriten"

#~ msgid "File cannot be uploaded, its maximum size may be %.1f MB."
#~ msgstr ""
#~ "Die Datei kann nicht hochgeladen werden, ihre Maximalgröße darf %.1f MB "
#~ "nicht überschreiten."

#~ msgid "Loaded module %s"
#~ msgstr "Modul %s wurde geladen"


(-)umc/widgets/Uploader.js (-25 / +42 lines)

Lines 87-92	Link Here

		//		A size limit for the uploaded file.

		//		A size limit for the uploaded file.

		maxSize: 524288,

		maxSize: 524288,

		//toggle mutliple files selectable

		multiFile: false,

		// make sure that no sizeClass is being set

		// make sure that no sizeClass is being set

		sizeClass: null,

		sizeClass: null,

Lines 124-129	Link Here

124

			this._uploader = new dojox.form.Uploader({

127

			this._uploader = new dojox.form.Uploader({

125

				url: '/umcp/upload' + (this.command ? '/' + this.command : ''),

128

				url: '/umcp/upload' + (this.command ? '/' + this.command : ''),

126

				label: this.buttonLabel,

129

				label: this.buttonLabel,

130

				multiple: this.multiFile,

131

				uploadOnSelect: false,

127

				getForm: function() {

132

				getForm: function() {

128

					// make sure that the Uploader does not find any of our encapsulating forms

133

					// make sure that the Uploader does not find any of our encapsulating forms

129

					return null;

134

					return null;

Lines 150-188	Link Here

150

			this.inherited(arguments);

155

			this.inherited(arguments);

151

156

152

			// as soon as the user has selected a file, start the upload

157

			// as soon as the user has selected a file, start the upload

153

			this._uploader.on('change', lang.hitch(this, function(data) {

158

154

				var allOk = array.every(data, function(ifile) {

159

			this._uploader.on('change', lang.hitch(this, function(_data) {

155

					return ifile.size <= this.maxSize;

160

				var _fileTooBig = [];

161

				var allOk = true;

162

				array.forEach(_data, function(ifile) {

163

					if (! (ifile.size <= this.maxSize)){

164

						_fileTooBig.push(ifile.name);

165

						allOk = false;

166

156

				}, this);

167

				}, this);

157

				if (!allOk) {

168

				if (!allOk) {

158

					dialog.alert(_('File cannot be uploaded, its maximum size may be %.1f MB.', this.maxSize / 1048576.0));

169

					dialog.alert(_('The following Files cannot be uploaded because they exceed the maximum file size: %s The maximum size of a file is %.1f MB.',('<ul><li>' + _fileTooBig.join('</li><li>') + '</li></ul>' ), this.maxSize / 1048576.0));

159

					this._uploader.reset();

170

					this._uploader.reset();

160

171

				}else {

161

				else {

172

					var data = _data;

162

					when(this.canUpload(data[0]), lang.hitch(this, function(doUpload) {

173

					if (data.length == 1){

174

						data = data[0];

175

						this.data = data;

176

177

					when(this.canUpload(data), lang.hitch(this, function(doUpload) {

163

						if (!doUpload) {

178

						if (!doUpload) {

164

							// upload canceled

179

						 	// upload canceled

165

							this._uploader.reset();

180

							this._uploader.reset();

166

							return;

181

							return;

167

182

						}else{

168

183

							// perform the upload

169

						// perform the upload

184

							var params = {};

170

						var params = {};

185

							if (this.dynamicOptions) {

171

						if (this.dynamicOptions) {

186

								if (typeof this.dynamicOptions == "function") {

172

							if (typeof this.dynamicOptions == "function") {

187

									lang.mixin(params, this.dynamicOptions(params));

173

								lang.mixin(params, this.dynamicOptions(params));

188

189

								else if (typeof this.dynamicOptions == "object") {

190

									lang.mixin(params, this.dynamicOptions);

191

174

192

175

							else if (typeof this.dynamicOptions == "object") {

193

							// mixin the iframe information

176

								lang.mixin(params, this.dynamicOptions);

194

							lang.mixin(params, {

177

195

								iframe: (this._uploader.uploadType === 'iframe') ? true : false

196

});

197

198

							this._uploader.upload(params);

199

							this._updateLabel();

200

							this.onUploadStarted(data);

178

201

179

						// mixin the iframe information

180

						lang.mixin(params, {

181

							iframe: (this._uploader.uploadType === 'iframe') ? true : false

182

});

183

						this._uploader.upload(params);

184

						this._updateLabel();

185

						this.onUploadStarted(data[0]);

186

					}));

202

					}));

187

203

188

			}));

204

			}));

Lines 193-198	Link Here

193

			// notification as soon as the file has been uploaded

209

			// notification as soon as the file has been uploaded

194

			this._uploader.on('complete', lang.hitch(this, function(data) {

210

			this._uploader.on('complete', lang.hitch(this, function(data) {

195

				if (data && data.result instanceof Array) {

211

				if (data && data.result instanceof Array) {

212

					console.debug('Upload Finished, Data:', data);

196

					this.set('data', data.result[0]);

213

					this.set('data', data.result[0]);

197

					this.onUploaded(this.data);

214

					this.onUploaded(this.data);

198

215

(-)umc/widgets/MultiUploader.js (-4 / +16 lines)

Lines 88-93	Link Here

		// internal reference to the current Uploader widget

		// internal reference to the current Uploader widget

		_uploader: null,

		_uploader: null,

		// allow selecting of Multiple Files

		multiFile: false,

		// internal reference to the progress bar

		// internal reference to the progress bar

		_progressBar: null,

		_progressBar: null,

Lines 232-237	Link Here

232

				command: this.command,

235

				command: this.command,

233

				dynamicOptions: this.dynamicOptions,

236

				dynamicOptions: this.dynamicOptions,

234

				maxSize: this.maxSize,

237

				maxSize: this.maxSize,

238

				multiFile: this.multiFile,

235

				canUpload: this.canUpload,

239

				canUpload: this.canUpload,

236

				style: 'float: left;'

240

				style: 'float: left;'

237

});

241

});

Lines 286-297	Link Here

286

						// add files to internal list of files

290

						// add files to internal list of files

287

						this._files.standby(false);

291

						this._files.standby(false);

288

						var vals = this.get('value');

292

						var vals = this.get('value');

289

						array.forEach(this._uploadingFiles, function(ifile) {

293

290

							//console.log('### adding:', ifile.name);

294

						if (this.multiFile && ( this._uploadingFiles[0] instanceof Array ) ){

295

							array.forEach(this._uploadingFiles[0], function(ifile){

296

								if (file.success) {

297

									vals.unshift(ifile.name);

298

299

});

300

						}else{

291

							if (file.success) {

301

							if (file.success) {

292

								vals.unshift(ifile.name);

302

								vals.unshift(this._uploadingFiles[0].name);

293

303

294

});

304

305

295

						this.set('value', vals);

306

						this.set('value', vals);

296

307

297

						// clear the list of uploading files

308

						// clear the list of uploading files

Lines 310-315	Link Here

310

			}));

321

			}));

311

},

322

},

312

323

324

313

		canUpload: function(fileInfo) {

325

		canUpload: function(fileInfo) {

314

			// summary:

326

			// summary:

315

			//		Before uploading a file, this function is called to make sure

327

			//		Before uploading a file, this function is called to make sure

Return to bug 32888