Attachment #5196 for bug #31199

View | Details | Raw Unified | Return to bug 31199
Collapse All | Expand All

(-)debian/control (+1 lines)

Lines 8-13	Link Here

 univention-management-console-dev,

 univention-management-console-dev,

 python-all

 python-all

Standards-Version: 3.8.2

Standards-Version: 3.8.2

XS-Python-Version: 2.6

Package: univention-system-info

Package: univention-system-info

Architecture: all

Architecture: all




	"dojo/_base/lang",
	"dojo/_base/array",
	"dojo/topic",
	"dojo/Deferred",
	"umc/tools",
	"umc/dialog",
	"umc/widgets/Module",
	"umc/widgets/Wizard",
	"umc/widgets/StandbyMixin",

	"umc/widgets/TextArea",
	"umc/widgets/CheckBox",
	"umc/i18n!umc/modules/sysinfo"
], function(declare, lang, array, topic, Deferred, tools, dialog, Module, Wizard, StandbyMixin, ComboBox, TextBox, Text, TextArea, CheckBox, _) {

	var SysinfoWizard = declare("umc.modules.sysinfo.Wizard", [ Wizard, StandbyMixin ], {


			}, {
				name: 'support',
				headerText: _('Support information'),
				helpText: '',
				widgets: [{
					type: Text,
					name: 'firstText',

			}, {
				name: 'collect',
				headerText: _('Collected data'),
				helpText: '',
				widgets: [{
					type: Text,
					name: 'firstText',

			}, {
				name: 'transfer',
				headerText: _('Transfer the information'),
				helpText: '',
				widgets: [{
					type: Text,
					name: 'firstText',

			}, {
				name: 'uploaded',
				headerText: _('Transfered successfully'),
				helpText: '',
				widgets: [{
					type: Text,
					name: 'firstText',

			}, {
				name: 'mail',
				headerText: _('Transfer via mail'),
				helpText: '',
				widgets: [{
					type: Text,
					name: 'firstText',

				layout: [['firstText'],
					 	 ['download'],
					 	 ['mail']]
			}, {
				name: 'uploaded_failed',
				headerText: _('Error during transfer'),
				helpText: '',
				widgets: [{
					type: Text,
					name: 'firstText',
					content: '<p>' + _('The automatic upload of the archive failed. Please go back and send the archive via e-mail. We apologize for the inconvenience.') + '</p>'
				}],
				layout: [['firstText']]
			}];
		},


		},

		hasNext: function(pageName) {
			if (pageName == 'uploaded' || pageName == 'mail') {
				return false;
			} else {
				return this.inherited(arguments);

				if (this.getWidget('transfer', 'method') == 'mail') {
					nextPage = 'mail';
				} else {
					nextPage = new Deferred();
					this.standby(true);
					this.uploadArchive().then(
						lang.hitch(this, function() {
							this.standby(false);
							nextPage.resolve('upload');
						}),
						lang.hitch(this, function() {
							this.standby(false);
							nextPage.resolve('uploaded_failed');
							dialog.alert(_('The automatic upload of the archive failed. Please go back and send the archive via e-mail. We apologize for the inconvenience.'));
						})
					);
				}

					return 'transfer';
				}
			}
			if (previousPage == 'mail') {
				return 'transfer';
			}
			return previousPage;
		},





import re
import subprocess

import univention.info_tools as uit
import univention.management.console as umc
import univention.management.console.modules as umcm
from univention.management.console.log import MODULE
from univention.management.console.protocol.definitions import MODULE_ERR, SUCCESS

from urllib import urlencode
from urlparse import urlunparse

# local module that overrides functions in urllib2
from upload import override_urllib_handlers
import urllib2

import univention.config_registry as ucr

_ = umc.Translation('univention-management-console-module-sysinfo').translate

override_urllib_handlers(urllib2)

class Instance(umcm.Base):
	def __init__(self):
		umcm.Base.__init__(self)

		fd = open(os.path.join(SYSINFO_PATH, request.options['archive']), 'r')
		data = {'filename': fd, }
		req = urllib2.Request(url, data, {})
		answer = None
		try:
			u = urllib2.urlopen(req)
			answer = u.read()
			success = True
		except Exception as e:
			answer = e
			success = False

		if not success or answer.startswith('ERROR:'):
			request.status = MODULE_ERR
			MODULE.error('Upload failed: %s' % answer)
		else:
			request.status = SUCCESS





        else:
            return self.parent.error('http', req, fp, code, msg, hdrs)

urllib2._old_HTTPHandler = urllib2.HTTPHandler
urllib2.HTTPHandler = newHTTPHandler

class newHTTPSHandler(newHTTPHandler):
    def https_open(self, req):
        return self.do_open(httplib.HTTPS, req)

def override_urllib_handlers(urllib2_module):
	urllib2_module._old_HTTPHandler = urllib2_module.HTTPHandler
	urllib2_module.HTTPHandler = newHTTPHandler
	urllib2_module.HTTPSHandler = newHTTPSHandler


Return to bug 31199