index : forums	master
	The forums.mageia.org Website	Maat [maat]

aboutsummaryrefslogtreecommitdiffstats

log msg author committer range

path: root/phpBB

diff options

context:	12345678910152025303540
space:	includeignore
mode:	unifiedssdiffstat only

author	Vic D'Elfant <vic@phpbb.com>	2008-02-24 14:38:35 +0000
committer	Vic D'Elfant <vic@phpbb.com>	2008-02-24 14:38:35 +0000
commit	a7ad9b5ae2e145a88d2acb0917162a3973337530 (patch)
tree	e7fd45bed4a18c2d84ee838e1899f629ef830998 /phpBB
parent	7ea118198e3af9f6ff97c883a75b38bef2fc3881 (diff)
download	forums-a7ad9b5ae2e145a88d2acb0917162a3973337530.tar forums-a7ad9b5ae2e145a88d2acb0917162a3973337530.tar.gz forums-a7ad9b5ae2e145a88d2acb0917162a3973337530.tar.bz2 forums-a7ad9b5ae2e145a88d2acb0917162a3973337530.tar.xz forums-a7ad9b5ae2e145a88d2acb0917162a3973337530.zip

#22035

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8395 89ea8834-ac86-4346-8a33-228a782c2dd0

Diffstat (limited to 'phpBB')

-rw-r--r--	phpBB/install/database_update.php	18
-rw-r--r--	phpBB/install/schemas/schema_data.sql	50

2 files changed, 43 insertions, 25 deletions

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 7eeca7dbb8..73e4ad548c 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1567,7 +1567,25 @@ if (version_compare($current_version, '3.0.0', '<=')) WHERE topic_last_view_time = 0"; _sql($sql, $errored, $error_ary); + // Update smiley sizes + $smileys = array('icon_e_surprised.gif','icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif'); + foreach ($smileys as $smiley) + { + if (file_exists($phpbb_root_path . 'images/smilies/' . $smiley)) + { + list($width, $height) = getimagesize($phpbb_root_path . 'images/smilies/' . $smiley); + + $sql = 'UPDATE ' . SMILIES_TABLE . ' + SET smiley_width = ' . $width . ', smiley_height = ' . $height . " + WHERE smiley_url = '" . $db->sql_escape($smiley) . "'"; + + _sql($sql, $errored, $error_ary); + } + } + // TODO: remove all form token min times + + $no_updates = false; } _write_result($no_updates, $errored, $error_ary); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 81b0805a8d..eb9b16841c 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -643,36 +643,36 @@ INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_heigh INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 10); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 11); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':sad:', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 12); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 19, 13); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 19, 14); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 19, 15); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 13); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 14); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 15); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':shock:', 'icon_eek.gif', '{L_SMILIES_SHOCKED}', 15, 15, 16); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 17); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 18); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':???:', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 19); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 15, 20); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 15, 21); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.gif', '{L_SMILIES_LAUGHING}', 15, 15, 22); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 15, 23); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 15, 24); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 15, 25); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 15, 26); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 15, 27); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 15, 28); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', '{L_SMILIES_EMARRASSED}', 15, 15, 29); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', '{L_SMILIES_CRYING}', 15, 15, 30); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', '{L_SMILIES_EVIL}', 15, 15, 31); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', '{L_SMILIES_TWISTED_EVIL}', 15, 15, 32); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.gif', '{L_SMILIES_ROLLING_EYES}', 15, 15, 33); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.gif', '{L_SMILIES_EXCLAMATION}', 15, 15, 34); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.gif', '{L_SMILIES_QUESTION}', 15, 15, 35); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.gif', '{L_SMILIES_IDEA}', 15, 15, 36); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.gif', '{L_SMILIES_ARROW}', 15, 15, 37); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 15, 38); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 15, 39); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.gif', '{L_SMILIES_MR_GREEN}', 15, 15, 40); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 20); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 21); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.gif', '{L_SMILIES_LAUGHING}', 15, 17, 22); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 23); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 24); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 25); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 26); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 27); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 28); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', '{L_SMILIES_EMARRASSED}', 15, 17, 29); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', '{L_SMILIES_CRYING}', 15, 17, 30); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', '{L_SMILIES_EVIL}', 15, 17, 31); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.gif', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.gif', '{L_SMILIES_EXCLAMATION}', 15, 17, 34); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.gif', '{L_SMILIES_QUESTION}', 15, 17, 35); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.gif', '{L_SMILIES_IDEA}', 15, 17, 36); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.gif', '{L_SMILIES_ARROW}', 15, 17, 37); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 38); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 39); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.gif', '{L_SMILIES_MR_GREEN}', 15, 17, 40); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':geek:', 'icon_e_geek.gif', '{L_SMILIES_GEEK}', 17, 17, 41); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.gif', '{L_SMILIES_UBER_GEEK}', 19, 18, 42); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.gif', '{L_SMILIES_UBER_GEEK}', 17, 18, 42); # -- icons INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.gif', 16, 16, 1, 1);

generated by cgit v1.2.1 (git 2.21.0) at 2026-05-15 17:57:26 +0000

<?xml version="1.0"?>


<Wizard
	name="general"
	libScript="__WIZ_HOME__/common/scripts/functions.sh"
	wizardTitle="Squid wizard"
	imagePosition="top"
	defaultImage="__WIZ_HOME__/proxy_wizard/images/proxy"
	perlModule="__WIZ_HOME__/proxy_wizard/scripts/Squidconf.pm"
	rpm="squid"
	summaryFunc="do_it_squid"
>
	<Variable
		name="var_wiz_squid_level"
		comment="The proxy access control level"
		shellVariable="wiz_squid_level"
		defaultValue="2"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_port"
		shellVariable="wiz_squid_port"
		valueIsTranslated="false"
		defaultValue="3128"
	>
	</Variable>

	<Variable
		name="wiz_squid_mem"
		shellVariable="wiz_squid_mem"
		defaultValue="16"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_disk"
		shellVariable="wiz_squid_disk"
		defaultValue="200"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_mynetw"
		shellVariable="wiz_squid_mynetw"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_defdir"
		shellVariable="wiz_squid_defdir"
		defaultValue="/var/spool/squid"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_cachepeer"
		shellVariable="wiz_squid_cachepeer"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_peerport"
		shellVariable="wiz_squid_peerport"
		defaultValue="3128"
		valueIsTranslated="false"
	>
	</Variable>

	<Variable
		name="wiz_squid_menupeer"
		shellVariable="wiz_squid_menupeer"
		defaultValue="1"
		valueIsTranslated="false"
	>
	</Variable>

	<Page
		name="Welcome"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Info
			helpText="Proxy Configuration Wizard"
		>
		</Info>


		<Info
			helpText="Squid is a web caching proxy server, it allows faster web access for your local network."
		>
		</Info>

		<Info
			helpText="This wizard will help you configuring your proxy server."
		>
		</Info>
	</Page>

	<Page
		name="port"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		func="testport"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Target
			targetName="warningport"
			jumpIndex="1"
		>
		</Target>

		<Target
			targetName="errorlow"
			jumpIndex="2"
		>
		</Target>

		<Target
			targetName="memory"
			jumpIndex="0"
		>
		</Target>

		<Info
			helpText="Proxy Port"
		>
		</Info>


		<Info
			helpText="Proxy port value sets what port the proxy server will listen on for http requests. Default is 3128, other common value can be 8080, the port value need to be greater than 1024."
		>
		</Info>


		<Freetext
			variableName="wiz_squid_port"
			helpText="Proxy port:"
			editable="true"
		>
		</Freetext>

	</Page>

	<Page
		name="memory"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpPage="ask_level"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Info
			helpText="Proxy Cache Size"
		>
		</Info>


		<Info
			helpText="Memory Cache is the amount of RAM dedicated to cache memory operations (note that actual memory usage of the whole squid process is bigger)."
		>
		</Info>

		<Info
			helpText="Disk Cache is the amount of disk space that can be used for caching on disk."
		>
		</Info>


		<Freetext
			name="wiz_squid_mem"
			variableName="wiz_squid_mem"
			helpText="Memory cache (MB):"
			editable="true"
		>
		</Freetext>

		<Freetext
			name="wiz_squid_disk"
			variableName="wiz_squid_disk"
			helpText="Disk space (MB):"
			editable="true"
		>
		</Freetext>


		<Info
			helpText="For information, here is /var/spool/squid space on disk:"
		>
		</Info>

		<Info
			helpText="Filesystem            Size  Used Avail Use% Mounted on"
		>
		</Info>

		<Info
			comment="free space on disk"
			fillScript="__WIZ_HOME__/proxy_wizard/scripts/dfh.sh"
		>
		</Info>

	</Page>

	<Page
		name="ask_level"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpScript="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_level"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Target
			targetName="cachepeer"
			jumpIndex="1"
		>
		</Target>

		<Target
			targetName="shownet"
			jumpIndex="2"
		>
		</Target>

		<Target
			targetName="cachepeer"
			jumpIndex="3"
		>
		</Target>

		<Info
			helpText="Access Control"
		>
		</Info>


		<Info
			helpText="The proxy can be configured to use different access control levels."
		>
		</Info>

		<Info
			helpText="Choose the level that suits your needs. If you don't know,the Local Network level is usually the most appropriate. Beware that the All level may be not secure."
		>
		</Info>

		<Chooser
			name="chooser1"
			variableName="var_wiz_squid_level"
			helpFontName="Default"
			helpFontStyle="plain"
			helpFontSize="12"
			editable="false"
		>

			<Option
				value="1"
				description="All - No access restriction"
			>
			</Option>

			<Option
				value="2"
				description="Local Network - access for local network (recommended)"
			>
			</Option>

			<Option
				value="3"
				description="Localhost - access restricted to this server only"
			>
			</Option>
		</Chooser>
	</Page>

	<Page
		name="warningport"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpPage="memory"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Info
			helpText="Warning:"
		>
		</Info>


		<Info
			helpText="You have entered a port that may be useful for this service:"
		>
		</Info>
		<Info
			helpText="Press Next if you want to keep this value, or Back to correct your choice."
		>
		</Info>

		<Freetext
			fillfunc="port"
			helpText="/etc/services:"
			editable="false"
		>
		</Freetext>
	</Page>

	<Page
		name="shownet"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpPage="cachepeer"
		executionLevel="NORMAL"
		is="var_wiz_squid_level=2"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Info
			helpText="Grant access on local network"
		>
		</Info>


		<Info
			helpText="Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed."
		>
		</Info>

		<Info
			helpText="You can use either a numeric format like \q192.168.1.0/255.255.255.0\q or a text format like \q.domain.net\q"
		>
		</Info>


		<Freetext
			name="f_wiz_squid_mynetw"
			variableName="wiz_squid_mynetw"
			fillfunc="network_mask"
			helpText="Authorised network:"
			editable="true"
			help="Use numeric format like \q192.168.1.0/255.255.255.0\q or a text format like \q.domain.net\q"
		>
		</Freetext>

	</Page>

	<Page
		name="cachepeer"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpScript="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>
		<Target
			targetName="doit2"
			jumpIndex="1"
		>
		</Target>

		<Target
			targetName="valcachepeer"
			jumpIndex="2"
		>
		</Target>
		<Info
			helpText="Cache hierarchy"
		>
		</Info>


		<Info
			helpText="As an option, Squid can be configured in proxy cascading. You can add a new upper level proxy by specifying its hostname and port."
		>
		</Info>

		<Info
			helpText="You can safely select \qNo upper level proxy\q if you don't need this feature."
		>
		</Info>


		<Chooser
			name="chooser4"
			variableName="wiz_squid_menupeer"
			helpFontName="Default"
			helpFontStyle="plain"
			helpFontSize="12"
			editable="false"
		>

			<Option
				value="1"
				description="No upper level proxy (recommended)"
			>
			</Option>

			<Option
				value="2"
				description="Define an upper level proxy"
			>
			</Option>

		</Chooser>


	</Page>


	<Page
		name="valcachepeer"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpPage="doit"
		executionLevel="NORMAL"
		nextFinish="false"
		is="wiz_squid_menupeer=2"
		canBack="true"
		canCancel="true"
	>

		<Info
			helpText="Cache hierarchy"
		>
		</Info>


		<Info
			helpText="Enter the qualified hostname (like \qcache.domain.net\q) and the port of the proxy to use."
		>
		</Info>


		<Freetext
			name="_wiz_squid_cachepeer"
			variableName="wiz_squid_cachepeer"
			helpText="Upper level proxy hostname:"
			editable="true"
		>
		</Freetext>

		<Freetext
			name="_wiz_squid_peerport"
			variableName="wiz_squid_peerport"
			helpText="Upper level proxy port:"
			editable="true"
		>
		</Freetext>

	</Page>

	<Page
		name="doit"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		func="do_it_squid"
		nextButtonText="Configure"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Target
			targetName="catastrophic_exit"
			jumpIndex="1"
		>
		</Target>

		<Target
			targetName="done"
			jumpIndex="10"
		>
		</Target>

		<Info
			helpText="Configuring the Proxy"
		>
		</Info>


		<Info
			helpText="The wizard collected the following parameters needed to configure your proxy:"
		>
		</Info>

		<Freetext
			name="s_port"
			variableName="wiz_squid_port"
			helpText="Port:"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_mem"
			variableName="wiz_squid_mem"
			helpText="Memory cache (MB):"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_disk"
			variableName="wiz_squid_disk"
			helpText="Disk space (MB):"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_level"
			fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
			helpText="Access Control:"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_peer"
			variableName="wiz_squid_cachepeer"
			helpText="Upper level proxy hostname:"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_peerport"
			variableName="wiz_squid_peerport"
			helpText="Upper level proxy port:"
			editable="false"
		>
		</Freetext>


		<Info
			helpText="To accept these values, and configure your server, click the Next button or use the Back button to correct them."
		>
		</Info>
	</Page>

	<Page
		name="doit2"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		func="do_it_squid"
		nextButtonText="Configure"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="true"
	>

		<Target
			targetName="catastrophic_exit"
			jumpIndex="1"
		>
		</Target>

		<Target
			targetName="done"
			jumpIndex="10"
		>
		</Target>

		<Info
			helpText="Configuring the Proxy"
		>
		</Info>


		<Info
			helpText="The wizard collected the following parameters needed to configure your proxy:"
		>
		</Info>
		


		<Freetext
			name="s_port"
			variableName="wiz_squid_port"
			helpText="Port:"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_mem"
			variableName="wiz_squid_mem"
			helpText="Memory cache (MB):"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_disk"
			variableName="wiz_squid_disk"
			helpText="Disk space (MB):"
			editable="false"
		>
		</Freetext>

		<Freetext
			name="s_level"
			variableName="wiz_squid_mynetw"
			fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
			helpText="Access Control:"
			editable="false"
		>
		</Freetext>


		<Info
			helpText="To accept these values, and configure your server, click the Next button or use the Back button to correct them."
		>
		</Info>
	</Page>

	<Page
		name="done"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		nextButtonText="Quit"
		executionLevel="NORMAL"
		nextFinish="true"
		canBack="false"
		canCancel="false"
	>

		<Info
			helpText="Congratulations"
		>
		</Info>


		<Info
			helpText="The wizard successfully configured your proxy server."
		>
		</Info>
	</Page>

	<Page
		name="catastrophic_exit"
		comment="Exit in case of catastrophhic system error"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		nextButtonText="Exit"
		executionLevel="NORMAL"
		nextFinish="true"
		canBack="false"
		canCancel="false"
	>

		<Info
			helpText="Something terrible happened"
		>
		</Info>
	</Page>

	<Page
		name="error_need_root"
		comment="Error: this wizard must run as root."
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		nextButtonText="OK"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="false"
		canCancel="false"
	>

		<Info
			helpText="This Wizard need to run as root"
		>
		</Info>
	</Page>

	<Page
		name="errorlow"
		comment="lt 1024"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		jumpPage="port"
		nextButtonText="OK"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="true"
		canCancel="false"
	>

		<Info
			helpText="Warning:"
		>
		</Info>


		<Info
			helpText="You must choose a port greater than 1024 and lower than 65535"
		>
		</Info>



		<Info
			helpText="Press back to change the value."
		>
		</Info>

	</Page>

	<Page
		name="error_need_net"
		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
		executionLevel="NORMAL"
		nextFinish="false"
		canBack="false"
		canCancel="true"
	>

		<Info
			helpText="Network not configured yet"
		>
		</Info>


		<Info
			helpText="You have to configure the basic network parameters before launching this wizard."
		>
		</Info>

		<Info
			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
		>
		</Info>


		<Info
			helpText="If you choose to configure now, you will automatically continue with the Proxy configuration."
		>
		</Info>
	</Page>
</Wizard>