[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.84, 1.85 class
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.84, 1.85 class.sotts.inc.php, 1.28, 1.29 class.soadmin_entity.inc.php, 1.1, 1.2 class.uiadmin_entity.inc.php, 1.1, 1.2 class.sotts2.inc.php, 1.6, 1.7 dateformat.js, 1.1, 1.2 |
|
Date: |
Wed, 15 Oct 2003 17:27:40 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv15981/inc
Modified Files:
class.bocommon.inc.php class.sotts.inc.php
class.soadmin_entity.inc.php class.uiadmin_entity.inc.php
class.sotts2.inc.php dateformat.js
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** class.bocommon.inc.php 10 Oct 2003 21:57:13 -0000 1.84
--- class.bocommon.inc.php 15 Oct 2003 17:27:38 -0000 1.85
***************
*** 765,769 ****
--- 765,800 ----
$menu['module'][$i]['statustext'] =
lang('Report');
+ $entity =
CreateObject($this->currentapp.'.soadmin_entity');
+ $entity_list =
$entity->read(array('allrows'=>True));
+
+ if (isset($entity_list) AND
is_array($entity_list))
+ {
+ foreach($entity_list as $entry)
+ {
+ $i++;
+ $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientity.index&entity_id='
.$entry['id']);
+ $menu['module'][$i]['name']
= $entry['name'];
+
$menu['module'][$i]['statustext'] = $entry['descr'];
+ }
+ }
+
$i=0;
+
+ $entity_id =
$GLOBALS['phpgw']->session->appsession('entity_id',$currentapp);
+ if ($sub == 'entity_'.$entity_id)
+ {
+ $entity_category =
$entity->read_category(array('allrows'=>True,'entity_id'=>$entity_id));
+ $k=count($entity_category);
+ for ($j=0; $j<$k; $j++)
+ {
+ $i++;
+ $menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientity.index&entity_id='
.$entity_id .'&cat_id=' .$entity_category[$j]['id'] );
+ $menu['sub_menu'][$i]['name'] =
$entity_category[$j]['name'];
+
$menu['sub_menu'][$i]['statustext'] = $entity_category[$j]['descr'];
+ }
+
+ }
+ unset($entity);
+
if ($sub == 'equipment')
{
Index: dateformat.js
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/dateformat.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dateformat.js 10 May 2003 16:35:04 -0000 1.1
--- dateformat.js 15 Oct 2003 17:27:38 -0000 1.2
***************
*** 1,10 ****
! <!-- Original: Richard Gorremans (address@hidden) -->
! <!-- Web Site: http://www.spiritwolfx.com -->
! <!-- This script and many more are available free online at -->
! <!-- The JavaScript Source!! http://javascript.internet.com -->
<!-- Begin
// Check browser version
var isNav4 = false, isNav5 = false, isIE4 = false
--- 1,21 ----
+ //Copyright (C) 2002,2003 Richard Gorremans
+ //This library is free software; you can redistribute it and/or
+ //modify it under the terms of the GNU Lesser General Public
+ //License as published by the Free Software Foundation; either
+ //version 2.1 of the License, or (at your option) any later version.
! //This library 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
! //Lesser General Public License for more details.
! //You should have received a copy of the GNU Lesser General Public
! //License along with this library; if not, write to the Free Software
! //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ <!-- Original: Richard Gorremans (address@hidden) -->
+ <!-- Updates: www.spiritwolfx.com -->
<!-- Begin
+
// Check browser version
var isNav4 = false, isNav5 = false, isIE4 = false
***************
*** 12,422 ****
// If you are using any Java validation on the back side you will want to use
the / because
// Java date validations do not recognize the dash as a valid date separator.
var vDateType = 3; // Global value for type of date format
// 1 = mm/dd/yyyy
// 2 = yyyy/dd/mm (Unable to do date check at this time)
// 3 = dd/mm/yyyy
var vYearType = 4; //Set to 2 or 4 for number of digits in the year for
Netscape
var vYearLength = 2; // Set to 4 if you want to force the user to enter 4
digits for the year before validating.
var err = 0; // Set the error code to a default of zero
! if(navigator.appName == "Netscape") {
! if (navigator.appVersion < "5") {
! isNav4 = true;
! isNav5 = false;
}
else
! if (navigator.appVersion > "4") {
! isNav4 = false;
! isNav5 = true;
! }
! }
! else {
! isIE4 = true;
}
! function DateFormat(vDateName, vDateValue, e, dateCheck, dateType) {
vDateType = dateType;
// vDateName = object name
// vDateValue = value in the field being checked
// e = event
// dateCheck
! // True = Verify that the vDateValue is a valid date
! // False = Format values being entered into vDateValue only
// vDateType
! // 1 = mm/dd/yyyy
! // 2 = yyyy/mm/dd
! // 3 = dd/mm/yyyy
! //Enter a tilde sign for the first number and you can check the variable
information.
! if (vDateValue == "~") {
! alert("AppVersion = "+navigator.appVersion+" \nNav. 4 Version = "+isNav4+"
\nNav. 5 Version = "+isNav5+" \nIE Version = "+isIE4+" \nYear Type =
"+vYearType+" \nDate Type = "+vDateType+" \nSeparator = "+strSeperator);
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
! var whichCode = (window.Event) ? e.which : e.keyCode;
! // Check to see if a seperator is already present.
! // bypass the date if a seperator is present and the length greater than 8
! if (vDateValue.length > 8 && isNav4) {
! if ((vDateValue.indexOf("-") >= 1) || (vDateValue.indexOf("/") >= 1))
! return true;
! }
! //Eliminate all the ASCII codes that are not valid
! var alphaCheck = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/-";
! if (alphaCheck.indexOf(vDateValue) >= 1) {
! if (isNav4) {
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! else {
! vDateName.value = vDateName.value.substr(0, (vDateValue.length-1));
! return false;
! }
! }
! if (whichCode == 8) //Ignore the Netscape value for backspace. IE has no value
! return false;
! else {
! //Create numeric string values for 0123456789/
! //The codes provided include both keyboard and keypad values
! var strCheck =
'47,48,49,50,51,52,53,54,55,56,57,58,59,95,96,97,98,99,100,101,102,103,104,105';
! if (strCheck.indexOf(whichCode) != -1) {
! if (isNav4) {
! if (((vDateValue.length < 6 && dateCheck) || (vDateValue.length == 7 &&
dateCheck)) && (vDateValue.length >=1)) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! if (vDateValue.length == 6 && dateCheck) {
! var mDay = vDateName.value.substr(2,2);
! var mMonth = vDateName.value.substr(0,2);
! var mYear = vDateName.value.substr(4,4)
! //Turn a two digit year into a 4 digit year
! if (mYear.length == 2 && vYearType == 4) {
! var mToday = new Date();
! //If the year is greater than 30 years from now use 19, otherwise use 20
! var checkYear = mToday.getFullYear() + 30;
! var mCheckYear = '20' + mYear;
! if (mCheckYear >= checkYear)
! mYear = '19' + mYear;
! else
! mYear = '20' + mYear;
! }
! var vDateValueCheck = mMonth+strSeperator+mDay+strSeperator+mYear;
! if (!dateValid(vDateValueCheck)) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! return true;
! }
! else {
! // Reformat the date for validation and set date type to a 1
! if (vDateValue.length >= 8 && dateCheck) {
! if (vDateType == 1) // mmddyyyy
! {
! var mDay = vDateName.value.substr(2,2);
! var mMonth = vDateName.value.substr(0,2);
! var mYear = vDateName.value.substr(4,4)
! vDateName.value = mMonth+strSeperator+mDay+strSeperator+mYear;
! }
! if (vDateType == 2) // yyyymmdd
! {
! var mYear = vDateName.value.substr(0,4)
! var mMonth = vDateName.value.substr(4,2);
! var mDay = vDateName.value.substr(6,2);
! vDateName.value = mYear+strSeperator+mMonth+strSeperator+mDay;
! }
! if (vDateType == 3) // ddmmyyyy
! {
! var mMonth = vDateName.value.substr(2,2);
! var mDay = vDateName.value.substr(0,2);
! var mYear = vDateName.value.substr(4,4)
! vDateName.value = mDay+strSeperator+mMonth+strSeperator+mYear;
! }
! //Create a temporary variable for storing the DateType and change
! //the DateType to a 1 for validation.
! var vDateTypeTemp = vDateType;
! vDateType = 1;
! var vDateValueCheck = mMonth+strSeperator+mDay+strSeperator+mYear;
! if (!dateValid(vDateValueCheck)) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateType = vDateTypeTemp;
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! vDateType = vDateTypeTemp;
! return true;
! }
! else {
! if (((vDateValue.length < 8 && dateCheck) || (vDateValue.length == 9 &&
dateCheck)) && (vDateValue.length >=1)) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! }
! }
! }
! else {
! // Non isNav Check
! if (((vDateValue.length < 8 && dateCheck) || (vDateValue.length == 9 &&
dateCheck)) && (vDateValue.length >=1)) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
! // Reformat date to format that can be validated. mm/dd/yyyy
! if (vDateValue.length >= 8 && dateCheck) {
! // Additional date formats can be entered here and parsed out to
! // a valid date format that the validation routine will recognize.
! if (vDateType == 1) // mm/dd/yyyy
! {
! var mMonth = vDateName.value.substr(0,2);
! var mDay = vDateName.value.substr(3,2);
! var mYear = vDateName.value.substr(6,4)
! }
! if (vDateType == 2) // yyyy/mm/dd
! {
! var mYear = vDateName.value.substr(0,4)
! var mMonth = vDateName.value.substr(5,2);
! var mDay = vDateName.value.substr(8,2);
! }
! if (vDateType == 3) // dd/mm/yyyy
! {
! var mDay = vDateName.value.substr(0,2);
! var mMonth = vDateName.value.substr(3,2);
! var mYear = vDateName.value.substr(6,4)
! }
! if (vYearLength == 4) {
! if (mYear.length < 4) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
! }
! // Create temp. variable for storing the current vDateType
! var vDateTypeTemp = vDateType;
! // Change vDateType to a 1 for standard date format for validation
! // Type will be changed back when validation is completed.
! vDateType = 1;
! // Store reformatted date to new variable for validation.
! var vDateValueCheck = mMonth+strSeperator+mDay+strSeperator+mYear;
! if (mYear.length == 2 && vYearType == 4 && dateCheck) {
! //Turn a two digit year into a 4 digit year
! var mToday = new Date();
! //If the year is greater than 30 years from now use 19, otherwise use 20
! var checkYear = mToday.getFullYear() + 30;
! var mCheckYear = '20' + mYear;
! if (mCheckYear >= checkYear)
! mYear = '19' + mYear;
! else
! mYear = '20' + mYear;
! vDateValueCheck = mMonth+strSeperator+mDay+strSeperator+mYear;
! // Store the new value back to the field. This function will
! // not work with date type of 2 since the year is entered first.
! if (vDateTypeTemp == 1) // mm/dd/yyyy
! vDateName.value = mMonth+strSeperator+mDay+strSeperator+mYear;
! if (vDateTypeTemp == 3) // dd/mm/yyyy
! vDateName.value = mDay+strSeperator+mMonth+strSeperator+mYear;
! }
! if (!dateValid(vDateValueCheck)) {
! alert("Invalid Date\nPlease Re-Enter");
! vDateType = vDateTypeTemp;
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
! vDateType = vDateTypeTemp;
! return true;
! }
! else {
! if (vDateType == 1) {
! if (vDateValue.length == 2) {
! vDateName.value = vDateValue+strSeperator;
! }
! if (vDateValue.length == 5) {
! vDateName.value = vDateValue+strSeperator;
! }
! }
! if (vDateType == 2) {
! if (vDateValue.length == 4) {
! vDateName.value = vDateValue+strSeperator;
! }
! if (vDateValue.length == 7) {
! vDateName.value = vDateValue+strSeperator;
}
! }
! if (vDateType == 3) {
! if (vDateValue.length == 2) {
! vDateName.value = vDateValue+strSeperator;
! }
! if (vDateValue.length == 5) {
! vDateName.value = vDateValue+strSeperator;
}
! }
! return true;
}
! }
! if (vDateValue.length == 10&& dateCheck) {
! if (!dateValid(vDateName)) {
// Un-comment the next line of code for debugging the dateValid() function
error messages
! //alert(err);
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.focus();
! vDateName.select();
! }
! }
! return false;
! }
! else {
! // If the value is not in the string return the string minus the last
! // key entered.
! if (isNav4) {
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! else
! {
! vDateName.value = vDateName.value.substr(0, (vDateValue.length-1));
! return false;
}
}
! }
! }
! function dateValid(objName) {
! var strDate;
! var strDateArray;
! var strDay;
! var strMonth;
! var strYear;
! var intday;
! var intMonth;
! var intYear;
! var booFound = false;
! var datefield = objName;
! var strSeparatorArray = new Array("-"," ","/",".");
! var intElementNr;
! // var err = 0;
! var strMonthArray = new Array(12);
! strMonthArray[0] = "Jan";
! strMonthArray[1] = "Feb";
! strMonthArray[2] = "Mar";
! strMonthArray[3] = "Apr";
! strMonthArray[4] = "May";
! strMonthArray[5] = "Jun";
! strMonthArray[6] = "Jul";
! strMonthArray[7] = "Aug";
! strMonthArray[8] = "Sep";
! strMonthArray[9] = "Oct";
! strMonthArray[10] = "Nov";
! strMonthArray[11] = "Dec";
! //strDate = datefield.value;
! strDate = objName;
! if (strDate.length < 1) {
! return true;
! }
! for (intElementNr = 0; intElementNr < strSeparatorArray.length;
intElementNr++) {
! if (strDate.indexOf(strSeparatorArray[intElementNr]) != -1) {
! strDateArray = strDate.split(strSeparatorArray[intElementNr]);
! if (strDateArray.length != 3) {
! err = 1;
! return false;
! }
! else {
! strDay = strDateArray[0];
! strMonth = strDateArray[1];
! strYear = strDateArray[2];
! }
! booFound = true;
! }
! }
! if (booFound == false) {
! if (strDate.length>5) {
! strDay = strDate.substr(0, 2);
! strMonth = strDate.substr(2, 2);
! strYear = strDate.substr(4);
! }
! }
! //Adjustment for short years entered
! if (strYear.length == 2) {
! strYear = '20' + strYear;
! }
! strTemp = strDay;
! strDay = strMonth;
! strMonth = strTemp;
! intday = parseInt(strDay, 10);
! if (isNaN(intday)) {
! err = 2;
! return false;
! }
! intMonth = parseInt(strMonth, 10);
! if (isNaN(intMonth)) {
! for (i = 0;i<12;i++) {
! if (strMonth.toUpperCase() == strMonthArray[i].toUpperCase()) {
! intMonth = i+1;
! strMonth = strMonthArray[i];
! i = 12;
! }
! }
! if (isNaN(intMonth)) {
! err = 3;
! return false;
! }
! }
! intYear = parseInt(strYear, 10);
! if (isNaN(intYear)) {
! err = 4;
! return false;
! }
! if (intMonth>12 || intMonth<1) {
! err = 5;
! return false;
! }
! if ((intMonth == 1 || intMonth == 3 || intMonth == 5 || intMonth == 7 ||
intMonth == 8 || intMonth == 10 || intMonth == 12) && (intday > 31 || intday <
1)) {
! err = 6;
! return false;
! }
! if ((intMonth == 4 || intMonth == 6 || intMonth == 9 || intMonth == 11) &&
(intday > 30 || intday < 1)) {
! err = 7;
! return false;
! }
! if (intMonth == 2) {
! if (intday < 1) {
! err = 8;
! return false;
! }
! if (LeapYear(intYear) == true) {
! if (intday > 29) {
! err = 9;
! return false;
! }
}
! else {
! if (intday > 28) {
! err = 10;
! return false;
}
- }
- }
- return true;
- }
- function LeapYear(intYear) {
- if (intYear % 100 == 0) {
- if (intYear % 400 == 0) { return true; }
- }
- else {
- if ((intYear % 4) == 0) { return true; }
- }
- return false;
- }
- // End -->
--- 23,528 ----
// If you are using any Java validation on the back side you will want to use
the / because
// Java date validations do not recognize the dash as a valid date separator.
+
var vDateType = 3; // Global value for type of date format
// 1 = mm/dd/yyyy
// 2 = yyyy/dd/mm (Unable to do date check at this time)
// 3 = dd/mm/yyyy
+
var vYearType = 4; //Set to 2 or 4 for number of digits in the year for
Netscape
var vYearLength = 2; // Set to 4 if you want to force the user to enter 4
digits for the year before validating.
+
var err = 0; // Set the error code to a default of zero
!
!
! if(navigator.appName == "Netscape")
! {
! if (navigator.appVersion < "5")
! {
! isNav4 = true;
! isNav5 = false;
! }
! else
! if (navigator.appVersion > "4")
! {
! isNav4 = false;
! isNav5 = true;
! }
}
else
! {
! isIE4 = true;
}
!
!
! function DateFormat(vDateName, vDateValue, e, dateCheck, dateType) {
!
vDateType = dateType;
+ mDateValue = vDateValue;
+
+
// vDateName = object name
// vDateValue = value in the field being checked
// e = event
// dateCheck
! // True = Verify that the vDateValue is a valid date
! // False = Format values being entered into vDateValue only
// vDateType
! // 1 = mm/dd/yyyy
! // 2 = yyyy/mm/dd
! // 3 = dd/mm/yyyy
!
!
! //Enter a tilde sign for the first number and you can check the variable
information.
! if (vDateValue == "~")
! {
! alert("AppVersion = "+navigator.appVersion+" \nNav. 4 Version =
"+isNav4+" \nNav. 5 Version = "+isNav5+" \nIE Version = "+isIE4+" \nYear Type =
"+vYearType+" \nDate Type = "+vDateType+" \nSeparator = "+strSeperator);
! vDateName.value = "";
! vDateName.focus();
! return true;
}
!
! var whichCode = (window.Event) ? e.which : e.keyCode;
!
! // Check to see if a seperator is already present.
! // bypass the date if a seperator is present and the length greater than 8
! if (vDateValue.length > 8 && isNav4)
! {
! if ((vDateValue.indexOf("-") >= 1) || (vDateValue.indexOf("/") >= 1))
! return true;
}
!
! //Eliminate all the ASCII codes that are not valid
! var alphaCheck = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/-";
! if (alphaCheck.indexOf(vDateValue) >= 1)
! {
! if (isNav4)
! {
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! else
! {
! vDateName.value = vDateName.value.substr(0, (vDateValue.length-1));
! return false;
! }
}
! if (whichCode == 8) //Ignore the Netscape value for backspace. IE has no
value
! return false;
! else
! {
! //Create numeric string values for 0123456789/
! //The codes provided include both keyboard and keypad values
!
! var strCheck =
'47,48,49,50,51,52,53,54,55,56,57,58,59,95,96,97,98,99,100,101,102,103,104,105';
! if (strCheck.indexOf(whichCode) != -1)
! {
! if (isNav4)
! {
! if (((vDateValue.length < 6 && dateCheck) || (vDateValue.length
== 7 && dateCheck)) && (vDateValue.length >=1))
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! if (vDateValue.length == 6 && dateCheck)
! {
! var mDay = vDateName.value.substr(2,2);
! var mMonth = vDateName.value.substr(0,2);
! var mYear = vDateName.value.substr(4,4)
!
! //Turn a two digit year into a 4 digit year
! if (mYear.length == 2 && vYearType == 4)
! {
! var mToday = new Date();
!
! //If the year is greater than 30 years from now use 19,
otherwise use 20
! var checkYear = mToday.getFullYear() + 30;
! var mCheckYear = '20' + mYear;
! if (mCheckYear >= checkYear)
! mYear = '19' + mYear;
! else
! mYear = '20' + mYear;
! }
! var vDateValueCheck =
mMonth+strSeperator+mDay+strSeperator+mYear;
!
! if (!dateValid(vDateValueCheck))
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! vDateName.value = vDateValueCheck;
! return true;
!
! }
! else
! {
! // Reformat the date for validation and set date type to a 1
!
!
! if (vDateValue.length >= 8 && dateCheck)
! {
! if (vDateType == 1) // mmddyyyy
! {
! var mDay = vDateName.value.substr(2,2);
! var mMonth = vDateName.value.substr(0,2);
! var mYear = vDateName.value.substr(4,4)
! vDateName.value =
mMonth+strSeperator+mDay+strSeperator+mYear;
! }
! if (vDateType == 2) // yyyymmdd
! {
! var mYear = vDateName.value.substr(0,4)
! var mMonth = vDateName.value.substr(4,2);
! var mDay = vDateName.value.substr(6,2);
! vDateName.value =
mYear+strSeperator+mMonth+strSeperator+mDay;
! }
! if (vDateType == 3) // ddmmyyyy
! {
! var mMonth = vDateName.value.substr(2,2);
! var mDay = vDateName.value.substr(0,2);
! var mYear = vDateName.value.substr(4,4)
! vDateName.value =
mDay+strSeperator+mMonth+strSeperator+mYear;
! }
!
! //Create a temporary variable for storing the DateType and
change
! //the DateType to a 1 for validation.
!
! var vDateTypeTemp = vDateType;
! vDateType = 1;
! var vDateValueCheck =
mMonth+strSeperator+mDay+strSeperator+mYear;
!
! if (!dateValid(vDateValueCheck))
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateType = vDateTypeTemp;
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! vDateType = vDateTypeTemp;
! return true;
! }
! else
! {
! if (((vDateValue.length < 8 && dateCheck) ||
(vDateValue.length == 9 && dateCheck)) && (vDateValue.length >=1))
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! }
! }
! }
! else
! {
! // Non isNav Check
! if (((vDateValue.length < 8 && dateCheck) || (vDateValue.length
== 9 && dateCheck)) && (vDateValue.length >=1))
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
!
! // Reformat date to format that can be validated. mm/dd/yyyy
!
!
! if (vDateValue.length >= 8 && dateCheck)
! {
!
! // Additional date formats can be entered here and parsed out
to
! // a valid date format that the validation routine will
recognize.
!
! if (vDateType == 1) // mm/dd/yyyy
! {
! var mMonth = vDateName.value.substr(0,2);
! var mDay = vDateName.value.substr(3,2);
! var mYear = vDateName.value.substr(6,4)
! }
! if (vDateType == 2) // yyyy/mm/dd
! {
! var mYear = vDateName.value.substr(0,4)
! var mMonth = vDateName.value.substr(5,2);
! var mDay = vDateName.value.substr(8,2);
! }
! if (vDateType == 3) // dd/mm/yyyy
! {
! var mDay = vDateName.value.substr(0,2);
! var mMonth = vDateName.value.substr(3,2);
! var mYear = vDateName.value.substr(6,4)
! }
! if (vYearLength == 4)
! {
! if (mYear.length < 4)
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
! }
!
! // Create temp. variable for storing the current vDateType
! var vDateTypeTemp = vDateType;
!
! // Change vDateType to a 1 for standard date format for
validation
! // Type will be changed back when validation is completed.
! vDateType = 1;
!
! // Store reformatted date to new variable for validation.
! var vDateValueCheck =
mMonth+strSeperator+mDay+strSeperator+mYear;
!
! if (mYear.length == 2 && vYearType == 4 && dateCheck)
! {
!
! //Turn a two digit year into a 4 digit year
! var mToday = new Date();
!
! //If the year is greater than 30 years from now use 19,
otherwise use 20
! var checkYear = mToday.getFullYear() + 30;
! var mCheckYear = '20' + mYear;
! if (mCheckYear >= checkYear)
! mYear = '19' + mYear;
! else
! mYear = '20' + mYear;
! vDateValueCheck =
mMonth+strSeperator+mDay+strSeperator+mYear;
!
! // Store the new value back to the field. This function
will
! // not work with date type of 2 since the year is entered
first.
!
! if (vDateTypeTemp == 1) // mm/dd/yyyy
! vDateName.value =
mMonth+strSeperator+mDay+strSeperator+mYear;
! if (vDateTypeTemp == 3) // dd/mm/yyyy
! vDateName.value =
mDay+strSeperator+mMonth+strSeperator+mYear;
!
! }
!
!
! if (!dateValid(vDateValueCheck))
! {
! alert("Invalid Date\nPlease Re-Enter");
! vDateType = vDateTypeTemp;
! vDateName.value = "";
! vDateName.focus();
! return true;
! }
! vDateType = vDateTypeTemp;
! return true;
!
! }
! else
! {
!
! if (vDateType == 1)
! {
! if (vDateValue.length == 2)
! {
! vDateName.value = vDateValue+strSeperator;
! }
! if (vDateValue.length == 5)
! {
! vDateName.value = vDateValue+strSeperator;
! }
! }
! if (vDateType == 2)
! {
! if (vDateValue.length == 4)
! {
! vDateName.value = vDateValue+strSeperator;
! }
! if (vDateValue.length == 7)
! {
! vDateName.value = vDateValue+strSeperator;
! }
! }
! if (vDateType == 3)
! {
! if (vDateValue.length == 2)
! {
! vDateName.value = vDateValue+strSeperator;
! }
! if (vDateValue.length == 5)
! {
! vDateName.value = vDateValue+strSeperator;
! }
! }
! return true;
! }
! }
! if (vDateValue.length == 10 && dateCheck)
! {
! if (!dateValid(vDateName))
! {
// Un-comment the next line of code for debugging the dateValid() function
error messages
! // alert(err);
! alert("Invalid Date\nPlease Re-Enter");
! vDateName.focus();
! vDateName.select();
! }
}
+ return false;
}
! else
! {
! // If the value is not in the string return the string minus the last
! // key entered.
! if (isNav4)
! {
! vDateName.value = "";
! vDateName.focus();
! vDateName.select();
! return false;
! }
! else
! {
! vDateName.value = vDateName.value.substr(0,
(vDateValue.length-1));
! return false;
! }
! }
! }
}
!
!
! function dateValid(objName) {
! var strDate;
! var strDateArray;
! var strDay;
! var strMonth;
! var strYear;
! var intday;
! var intMonth;
! var intYear;
! var booFound = false;
! var datefield = objName;
! var strSeparatorArray = new Array("-"," ","/",".");
! var intElementNr;
! // var err = 0;
! var strMonthArray = new Array(12);
! strMonthArray[0] = "Jan";
! strMonthArray[1] = "Feb";
! strMonthArray[2] = "Mar";
! strMonthArray[3] = "Apr";
! strMonthArray[4] = "May";
! strMonthArray[5] = "Jun";
! strMonthArray[6] = "Jul";
! strMonthArray[7] = "Aug";
! strMonthArray[8] = "Sep";
! strMonthArray[9] = "Oct";
! strMonthArray[10] = "Nov";
! strMonthArray[11] = "Dec";
!
! //strDate = datefield.value;
! strDate = objName;
!
! if (strDate.length < 1) {
! return true;
! }
! for (intElementNr = 0; intElementNr < strSeparatorArray.length;
intElementNr++) {
! if (strDate.indexOf(strSeparatorArray[intElementNr]) != -1)
! {
! strDateArray = strDate.split(strSeparatorArray[intElementNr]);
! if (strDateArray.length != 3)
! {
! err = 1;
! return false;
! }
! else
! {
! strDay = strDateArray[0];
! strMonth = strDateArray[1];
! strYear = strDateArray[2];
! }
! booFound = true;
! }
! }
! if (booFound == false) {
! if (strDate.length>5) {
! strDay = strDate.substr(0, 2);
! strMonth = strDate.substr(2, 2);
! strYear = strDate.substr(4);
! }
! }
! //Adjustment for short years entered
! if (strYear.length == 2) {
! strYear = '20' + strYear;
! }
! strTemp = strDay;
! strDay = strMonth;
! strMonth = strTemp;
! intday = parseInt(strDay, 10);
! if (isNaN(intday)) {
! err = 2;
! return false;
! }
!
! intMonth = parseInt(strMonth, 10);
! if (isNaN(intMonth)) {
! for (i = 0;i<12;i++) {
! if (strMonth.toUpperCase() == strMonthArray[i].toUpperCase()) {
! intMonth = i+1;
! strMonth = strMonthArray[i];
! i = 12;
! }
! }
! if (isNaN(intMonth)) {
! err = 3;
! return false;
! }
! }
! intYear = parseInt(strYear, 10);
! if (isNaN(intYear)) {
! err = 4;
! return false;
! }
! if (intMonth>12 || intMonth<1) {
! err = 5;
! return false;
! }
! if ((intMonth == 1 || intMonth == 3 || intMonth == 5 || intMonth == 7
|| intMonth == 8 || intMonth == 10 || intMonth == 12) && (intday > 31 || intday
< 1)) {
! err = 6;
! return false;
! }
! if ((intMonth == 4 || intMonth == 6 || intMonth == 9 || intMonth == 11)
&& (intday > 30 || intday < 1)) {
! err = 7;
! return false;
! }
! if (intMonth == 2) {
! if (intday < 1) {
! err = 8;
! return false;
! }
! if (LeapYear(intYear) == true) {
! if (intday > 29) {
! err = 9;
! return false;
! }
! }
! else {
! if (intday > 28) {
! err = 10;
! return false;
! }
! }
! }
! return true;
}
+ function LeapYear(intYear) {
+ if (intYear % 100 == 0) {
+ if (intYear % 400 == 0) { return true; }
+ }
+ else {
+ if ((intYear % 4) == 0) { return true; }
+ }
+ return false;
+ }
+ // End -->
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** class.sotts.inc.php 10 Oct 2003 21:57:15 -0000 1.28
--- class.sotts.inc.php 15 Oct 2003 17:27:38 -0000 1.29
***************
*** 84,88 ****
else
{
! $ordermethod = ' order by .fm_tts_tickets.id
DESC';
}
--- 84,88 ----
else
{
! $ordermethod = ' order by fm_tts_tickets.id
DESC';
}
Index: class.sotts2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** class.sotts2.inc.php 15 Sep 2003 18:28:43 -0000 1.6
--- class.sotts2.inc.php 15 Oct 2003 17:27:38 -0000 1.7
***************
*** 17,23 ****
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
--- 17,23 ----
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->join = $this->bocommon->join;
}
***************
*** 89,94 ****
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
assignedto='" . $ticket['assignedto']
! . "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
}
--- 89,97 ----
{
$fields_updated = True;
!
! $value_set=array('assignedto' =>
$ticket['assignedto']);
! $value_set =
$this->bocommon->validate_db_update($value_set);
!
! $this->db->query("update fm_tts_tickets set
$value_set where id='$id'",__LINE__,__FILE__);
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
}
***************
*** 97,102 ****
{
$fields_updated = True;
! $this->db->query("update fm_tts_tickets set
group_id='" . $ticket['group_id']
! . "' where id='$id'",__LINE__,__FILE__);
$this->historylog->add('G',$id,$ticket['group_id'],$oldgroup_id);
}
--- 100,108 ----
{
$fields_updated = True;
!
! $value_set=array('group_id' =>
$ticket['group_id']);
! $value_set =
$this->bocommon->validate_db_update($value_set);
!
! $this->db->query("update fm_tts_tickets set
$value_set where id='$id'",__LINE__,__FILE__);
$this->historylog->add('G',$id,$ticket['group_id'],$oldgroup_id);
}
Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.uiadmin_entity.inc.php 10 Oct 2003 21:57:15 -0000 1.1
--- class.uiadmin_entity.inc.php 15 Oct 2003 17:27:38 -0000 1.2
***************
*** 380,384 ****
'lang_save_standardtext' =>
lang('Save the standard'),
'type_id'
=> $values['type_id'],
! 'value_descr'
=> $values['descr']
);
--- 380,387 ----
'lang_save_standardtext' =>
lang('Save the standard'),
'type_id'
=> $values['type_id'],
! 'value_descr'
=> $values['descr'],
! 'lang_location_form' =>
lang('location form'),
! 'value_location_form' =>
$values['location_form'],
! 'lang_location_form_statustext' => lang('If
this entity type is to show up in location forms')
);
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.soadmin_entity.inc.php 10 Oct 2003 21:57:15 -0000 1.1
--- class.soadmin_entity.inc.php 15 Oct 2003 17:27:38 -0000 1.2
***************
*** 86,90 ****
'id' => $this->db->f('id'),
'name' => $this->db->f('name'),
- 'prefix'=> $this->db->f('prefix'),
'descr' => $this->db->f('descr')
);
--- 86,89 ----
***************
*** 172,175 ****
--- 171,175 ----
$entity['name'] = $this->db->f('name');
$entity['descr'] = $this->db->f('descr');
+ $entity['location_form']=
$this->db->f('location_form');
return $entity;
***************
*** 216,230 ****
}
! function add_entity($values)
{
! $values['name'] =
$this->db->db_addslashes($values['name']);
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['id'] = $this->next_id('fm_entity');
! $this->db->query("INSERT INTO fm_entity (id,name,
descr) "
! . "VALUES ('" . $values['id'] . "','" .
$values['name'] . "','" . $values['descr']. "')",__LINE__,__FILE__);
! $receipt['id']= $values['id'];
$receipt['message'][] = array('msg'=> lang('entity has
been added'));
--- 216,239 ----
}
! function add_entity($entity)
{
! $entity['name'] =
$this->db->db_addslashes($entity['name']);
! $entity['descr'] =
$this->db->db_addslashes($entity['descr']);
! $entity['id'] = $this->next_id('fm_entity');
! $values= array(
! $entity['id'],
! $entity['name'],
! $entity['descr'],
! $entity['location_form']
! );
! $values = $this->bocommon->validate_db_insert($values);
!
! $this->db->query("INSERT INTO fm_entity (id,name,
descr,location_form) "
! . "VALUES ($values)",__LINE__,__FILE__);
!
! $receipt['id']= $entity['id'];
$receipt['message'][] = array('msg'=> lang('entity has
been added'));
***************
*** 305,310 ****
$entity['descr'] =
$this->db->db_addslashes($entity['descr']);
! $this->db->query("UPDATE $table set descr='" .
$entity['descr'] . "', name='". $entity['name']
! . "' WHERE id='" . $entity['id'].
"'",__LINE__,__FILE__);
$receipt['message'][] = array('msg'=>
lang('entity has been edited'));
--- 314,328 ----
$entity['descr'] =
$this->db->db_addslashes($entity['descr']);
!
! $value_set=array(
! 'descr' => $entity['descr'],
! 'name' => $entity['name'],
! 'location_form' => $entity['location_form']
! );
!
! $value_set =
$this->bocommon->validate_db_update($value_set);
!
!
! $this->db->query("UPDATE $table set $value_set
WHERE id=" . $entity['id'],__LINE__,__FILE__);
$receipt['message'][] = array('msg'=>
lang('entity has been edited'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.84, 1.85 class.sotts.inc.php, 1.28, 1.29 class.soadmin_entity.inc.php, 1.1, 1.2 class.uiadmin_entity.inc.php, 1.1, 1.2 class.sotts2.inc.php, 1.6, 1.7 dateformat.js, 1.1, 1.2,
Sigurd Nes <address@hidden> <=