[yast-commit] r40498 - in /trunk/squid/src: Makefile.am SquidACL_local_functions.ycp dialogs.ycp helper_functions.ycp helps.ycp popup_dialogs.ycp store_del.ycp

Author: dfiser Date: Mon Aug 27 13:39:25 2007 New Revision: 40498 URL: http://svn.opensuse.org/viewcvs/yast?rev=40498&view=rev Log: Created new file with helper functions and some functions moved there. Added more checking in input data. Added: trunk/squid/src/helper_functions.ycp Modified: trunk/squid/src/Makefile.am trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/helps.ycp trunk/squid/src/popup_dialogs.ycp trunk/squid/src/store_del.ycp Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40498&r1=40497&r2=40498&view=diff ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Mon Aug 27 13:39:25 2007 @@ -14,7 +14,8 @@ complex.ycp \ inits.ycp \ store_del.ycp \ - SquidACL_local_functions.ycp + SquidACL_local_functions.ycp \ + helper_functions.ycp desktop_DATA = \ squid.desktop Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functions.ycp?rev=40498&r1=40497&r2=40498&view=diff ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Mon Aug 27 13:39:25 2007 @@ -33,6 +33,8 @@ import "Squid"; +include "squid/helper_functions.ycp"; + list<string> splitToChars(string str) { integer len = size(str); @@ -46,10 +48,6 @@ return (ret); } -boolean isIPAddr(string str) -{ - return regexpmatch(str, "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$"); -} boolean isMask(string str) { return regexpmatch(str, "^[0-9]+$") || isIPAddr(str); Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40498&r1=40497&r2=40498&view=diff ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Mon Aug 27 13:39:25 2007 @@ -50,25 +50,6 @@ return false; } -/** - * Returns a widget with setting of units - */ -term sizeUnitWidget(string id) -{ - return `ComboBox(`id(id), " ", - [`item("B"), `item("KB"), `item("MB")]); -} -/** - * Returns a widget with setting of units - */ -term timeUnitWidget(string id) -{ - return `ComboBox(`id(id), " ", - [`item("seconds"), `item("minutes"), `item("hours"), `item("days")]); -} - - - any HttpPortsDialog(){ any ret = nil; @@ -195,6 +176,8 @@ any Cache2Dialog(){ any ret = nil; string cache_dir = ""; + any tmp = nil; + any tmp2 = nil; term dialog_contents = `VCenter( `HBox( @@ -252,11 +235,11 @@ `Bottom(`PushButton(`id(`browse_cache_dir), Label::BrowseButton())) )), `VSpacing(0.4), - `IntField(`id("mbytes"), _("Size (in MB)"), 0, 99999, 0), + `IntField(`id("mbytes"), _("Size (in MB)"), 1, 99999, 1), `VSpacing(0.4), - `IntField(`id("l1dirs"), _("Level 1 Directories"), 0, 99999, 0), + `IntField(`id("l1dirs"), _("Level 1 Directories"), 1, 99999, 1), `VSpacing(0.4), - `IntField(`id("l2dirs"), _("Level 2 Directories"), 0, 99999, 0) + `IntField(`id("l2dirs"), _("Level 2 Directories"), 1, 99999, 1) ) )) ), @@ -266,6 +249,14 @@ Wizard::SetContentsButtons("Squid - Cache Setting 2", dialog_contents, HELPS["cache2"]:"", Label::BackButton(), Label::NextButton()); + UI::ChangeWidget(`id("cache_max_object_size"), `Notify, true); + UI::ChangeWidget(`id("cache_min_object_size"), `Notify, true); + UI::ChangeWidget(`id("cache_max_object_size_units"), `Notify, true); + UI::ChangeWidget(`id("cache_min_object_size_units"), `Notify, true); + + UI::ChangeWidget(`id("cache_swap_low"), `Notify, true); + UI::ChangeWidget(`id("cache_swap_high"), `Notify, true); + InitCache2Dialog(); while (true){ @@ -284,6 +275,36 @@ if (cache_dir != nil){ UI::ChangeWidget(`id("cache_dir"), `Value, cache_dir); } + + //cache_min_object_size <= cache_max_object_size + }else if (ret == "cache_min_object_size" || ret == "cache_min_object_size_units"){ + tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if ((integer)tmp > (integer)tmp2){ + UI::ChangeWidget(`id("cache_max_object_size"), `Value, UI::QueryWidget(`id("cache_min_object_size"), `Value)); + UI::ChangeWidget(`id("cache_max_object_size_units"), `Value, UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + } + }else if (ret == "cache_max_object_size" || ret == "cache_max_object_size_units"){ + tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if ((integer)tmp > (integer)tmp2){ + UI::ChangeWidget(`id("cache_min_object_size"), `Value, UI::QueryWidget(`id("cache_max_object_size"), `Value)); + UI::ChangeWidget(`id("cache_min_object_size_units"), `Value, UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + } + + //cache_swap_low <= cache_swap_high + }else if (ret == "cache_swap_low"){ + tmp = UI::QueryWidget(`id("cache_swap_low"), `Value); + if ((integer)tmp > (integer)UI::QueryWidget(`id("cache_swap_high"), `Value)) + UI::ChangeWidget(`id("cache_swap_high"), `Value, tmp); + }else if (ret == "cache_swap_high"){ + tmp = UI::QueryWidget(`id("cache_swap_high"), `Value); + if ((integer)UI::QueryWidget(`id("cache_swap_low"), `Value) > (integer)tmp) + UI::ChangeWidget(`id("cache_swap_low"), `Value, tmp); } } Added: trunk/squid/src/helper_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helper_functions.ycp?rev=40498&view=auto ============================================================================== --- trunk/squid/src/helper_functions.ycp (added) +++ trunk/squid/src/helper_functions.ycp Mon Aug 27 13:39:25 2007 @@ -0,0 +1,112 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/squid/helper_functions.ycp + * Package: Configuration of squid + * Summary: Helper functions for various situations. + * Authors: Daniel Fiser + * + * $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $ + */ +{ +textdomain "squid"; + +import "FileUtils"; + + +/** + * Returns a widget with setting of units + */ +term sizeUnitWidget(string id) +{ + return `ComboBox(`id(id), " ", + [`item("KB"), `item("MB")]); +} + +/** + * Returns multiple which equals to given parameter. + */ +integer unitToMultiple(string unit) +{ + if (unit == "KB") return 1024; + if (unit == "MB") return 1024*1024; +} + + +/** + * Returns a widget with setting of units + */ +term timeUnitWidget(string id) +{ + return `ComboBox(`id(id), " ", + [`item("seconds"), `item("minutes"), `item("hours"), `item("days")]); +} + + +boolean isCorrectPathnameOfLogFile(string str) +{ + boolean ok = regexpmatch(str, "^/([^/]+/)*[^/]+$"); + if (ok){ + list<string> dir = regexptokenize(str, "^(.+)/[^/]+$"); + if (!FileUtils::IsDirectory(dir[0]:"/")) + ok = false; + } + return ok; +} + +boolean isIPAddr(string str) +{ + boolean ok = true; + list<string> l = regexptokenize(str, "^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)$"); + + if (size(l) != 4){ + ok = false; + }else{ + integer i = 0; + foreach (string value, l, + { + i = tointeger(value); + if (i < 0 || i > 255){ + ok = false; + break; + } + }); + } + + return ok; +} + +boolean isHostName(string str) +{ + //max 22 chars length + //see http://www.no-ip.com/support/faq/EN/dynamic_ddns/what_is_a_valid_hostname.ht... + return regexpmatch(str, "^[a-zA-Z0-9][a-zA-Z0-9-]{0,21}$"); +} + +boolean isCorrectHost(string host) +{ + if (!isIPAddr(host) && !isHostName(host)) + return false; + return true; +} + + +} Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=40498&r1=40497&r2=40498&view=diff ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Mon Aug 27 13:39:25 2007 @@ -20,9 +20,7 @@ /** * File: include/squid/helps.ycp - * Package: Configuration of squid - * Summary: Help texts of all the dialogs except AddEditACLDialog. - * Authors: Daniel Fiser + * Package: Configuration of squid * Summary: Help texts of all the dialogs except AddEditACLDialog. * Authors: Daniel Fiser * * $Id: helps.ycp 27914 2006-02-13 14:32:08Z locilka $ */ @@ -96,7 +94,7 @@ "cache2" : _("<p><b>Cache memory</b> defines the ideal amount of memory to be used for objects.</p>") + _("<p><b>Max Object Size</b> defines maximum size for objects to be stored -in the disk.</p>") + +in the disk. Objects larger than this size will not be saved on disk.</p>") + _("<p><b>Min Object Size</b> specifies the minimum object size below which will not be saved to the disk.</p>") + _("<p>Replacement begins when the swap (disk) usage is above the Modified: trunk/squid/src/popup_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/popup_dialogs.ycp?rev=40498&r1=40497&r2=40498&view=diff ============================================================================== --- trunk/squid/src/popup_dialogs.ycp (original) +++ trunk/squid/src/popup_dialogs.ycp Mon Aug 27 13:39:25 2007 @@ -35,6 +35,7 @@ include "squid/inits.ycp"; include "squid/store_del.ycp"; +include "squid/helper_functions.ycp"; /***************** HTTP PORT ********************/ /** @@ -65,6 +66,7 @@ UI::OpenDialog(`opt(`decorated), contents); UI::ChangeWidget(`id("port"), `ValidChars, "1234567890"); + UI::ChangeWidget(`id("host"), `InputMaxLength, 22); InitAddEditHttpPortDialog(id_item); @@ -95,6 +97,8 @@ any ui = nil; string label = (id_item == nil ? _("Add New Refresh Pattern") : _("Edit Current refresh Pattern")); + any tmp = nil; + term contents = `VBox( `Label(label), @@ -104,9 +108,9 @@ `TextEntry(`id("regexp"), _("Regular Expression"), ""), `Bottom(`CheckBox(`id("regexp_case_insensitive"), _("Case Insensitive"))) )), - `IntField(`id("min"), _("Min (in minutes)"), 0, 99999, 0), + `IntField(`id("min"), `opt(`notify), _("Min (in minutes)"), 0, 99999, 0), `IntField(`id("percent"), _("Percent"), 0, 99999, 0), - `IntField(`id("max"), _("Max (in minutes)"), 0, 99999, 0), + `IntField(`id("max"), `opt(`notify), _("Max (in minutes)"), 0, 99999, 0), `VSpacing(), `VStretch(), @@ -132,6 +136,13 @@ ret = true; break; } + }else if (ui == "min"){ + if ((integer)tmp > (integer)UI::QueryWidget(`id("max"), `Value)) + UI::ChangeWidget(`id("max"), `Value, tmp); + }else if (ui == "max"){ + tmp = UI::QueryWidget(`id("max"), `Value); + if ((integer)UI::QueryWidget(`id("min"), `Value) > (integer)tmp) + UI::ChangeWidget(`id("min"), `Value, tmp); } } Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=40498&r1=40497&r2=40498&view=diff ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Mon Aug 27 13:39:25 2007 @@ -43,19 +43,7 @@ include "squid/helps.ycp"; - -/****** help functions **********/ -boolean isCorrectPathnameOfLogFile(string str) -{ - boolean ok = regexpmatch(str, "^/([^/]+/)*[^/]+$"); - if (ok){ - list<string> dir = regexptokenize(str, "^(.+)/[^/]+$"); - if (!FileUtils::IsDirectory(dir[0]:"/")) - ok = false; - } - return ok; -} -/****** help functions END ******/ +include "squid/helper_functions.ycp"; /***************** HTTP_PORT ********************/ boolean StoreDataFromAddEditHttpPortDialog(integer id_item) @@ -64,16 +52,28 @@ string host = (string)UI::QueryWidget(`id("host"), `Value); string port = (string)UI::QueryWidget(`id("port"), `Value); boolean transparent = (boolean)UI::QueryWidget(`id("transparent"), `Value); + string error_msg = ""; - if (size(port) > 0){ + if (size(port) == 0){ + error_msg = error_msg + (size(error_msg)>0 ? "\n" : "") + + _("Port number must not be empty."); + ok = false; + } + if (size(host) > 0 && !isCorrectHost(host)){ + error_msg = error_msg + (size(error_msg)>0 ? "\n" : "") + + _("Host must contain valid ip address or hostname."); + ok = false; + } + + + if (ok){ if (id_item == nil){ Squid::AddHttpPort(host, port, transparent); }else{ Squid::ModifyHttpPort(id_item, host, port, transparent); } }else{ - Report::Error(_("Port number must not be empty.")); - ok = false; + Report::Error(error_msg); } return ok; @@ -166,6 +166,17 @@ Report::Error(_("Cache directory must not be empty.")); }else if (!FileUtils::CheckAndCreatePath(cache_dir)){ ok = false; + }else{ + integer cache_mem = (integer)UI::QueryWidget(`id("cache_mem"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_mem_units"), `Value)); + integer cache_dir_mbytes = (integer)UI::QueryWidget(`id("mbytes"), `Value) * 1024 * 1024; + integer max_obj_size = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + + if (max_obj_size > cache_mem + cache_dir_mbytes){ + ok = false; + Report::Error( _("Cache Memory + Size of Cache Directory\nmust be more than Max Object Size.")); + } } if (ok){ @@ -446,16 +457,23 @@ boolean StoreDataFromMiscellaneousDialog() { + boolean ok = true; string error_language = (string)UI::QueryWidget(`id("error_language"), `Value); string cache_mgr = (string)UI::QueryWidget(`id("cache_mgr"), `Value); string ftp_passive = (boolean)UI::QueryWidget(`id("ftp_passive"), `Value) ? "on" : "off"; - Squid::SetSetting("error_directory",[SquidErrorMessages::GetPath(error_language)]); - Squid::SetSetting("cache_mgr", [cache_mgr]); - Squid::SetSetting("ftp_passive", [ftp_passive]); + if (regexpmatch(cache_mgr, "[ \t\n]")){ + ok = false; + Report::Error( _("Administrator's E-mail must not contain any white spaces.")); + } - return true; + if (ok){ + Squid::SetSetting("error_directory",[SquidErrorMessages::GetPath(error_language)]); + Squid::SetSetting("cache_mgr", [cache_mgr]); + Squid::SetSetting("ftp_passive", [ftp_passive]); + } + + return ok; } -/********************* STORING + DELETING END ********************/ } /* vim: set sw=4 ts=4 et ft=ycp : */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org