diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc index 4320d23..5f86ec2 100644 --- a/lib/util/ktutil.inc +++ b/lib/util/ktutil.inc @@ -7,32 +7,32 @@ * KnowledgeTree Open Source Edition * Document Management Made Simple * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 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, see . - * + * * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original - * copyright notice. + * must display the words "Powered by KnowledgeTree" and retain the original + * copyright notice. * Contributor( s): ______________________________________ */ @@ -117,17 +117,20 @@ class KTUtil { function strToBool ($sString, $null = false, $empty = false) { $sString = strtoupper($sString); - if ($sString == "Y") { - return true; - } elseif (($sString == "N")) { - return false; - } elseif (($sString == "ON")) { - return true; - } elseif (($sString == "OFF")) { - return false; - } elseif (($sString == "")) { + if (in_array($sString, array('Y','YES','ON','TRUE'))) + { + return true; + } + elseif (in_array($sString, array('N', 'NO','OFF','FALSE'))) + { + return false; + } + elseif ($sString == '') + { return $empty; - } else { + } + else + { return $null; } }