WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,060 Commits 3 Branches 143 Tags 138 MiB
Commit Graph

1374 Commits

Author SHA1 Message Date
Roland Gruber 8176cdccac added message for expired sessions 2006-05-01 08:56:40 +00:00
Roland Gruber f1986c3cd1 updated password message 2006-04-29 10:04:30 +00:00
Roland Gruber 69d1af357b use MHash to generate NT password hash 2006-04-29 09:58:17 +00:00
Roland Gruber 856f2ebcd8 allow \"@\" in passwords (1477878) 2006-04-28 08:44:26 +00:00
Roland Gruber 1da86f28b2 apply Tim's patch 2006-04-27 14:43:52 +00:00
Roland Gruber f0c891b9f4 undo last commit, this is better fixed in lists.inc 2006-04-27 14:26:43 +00:00
Roland Gruber 364050afbe fixed problem with PDFs (1477111) 2006-04-26 18:57:30 +00:00
Roland Gruber 185d3fd2ce added host restriction 2006-04-25 11:25:07 +00:00
Roland Gruber 0fec1ae9c1 added logging 2006-04-23 16:33:25 +00:00
Roland Gruber ef8365d787 implemented session timeout 2006-04-18 10:57:16 +00:00
Roland Gruber faa7679d16 do not show PHP trace 2006-04-16 12:42:40 +00:00
Roland Gruber f392ec1d6c allow caret in passwords 2006-04-10 14:19:22 +00:00
Roland Gruber dc3f060057 fixed regex for passwords 2006-04-09 10:10:35 +00:00
Roland Gruber 79a8a315a6 added fix for wrong spelled object classes 2006-04-05 15:48:27 +00:00
Roland Gruber d1d23d9a06 Security functions 2006-03-26 11:36:43 +00:00
Roland Gruber 29780c98c0 added primary group to profile 2006-03-19 11:25:57 +00:00
Roland Gruber f4fc70e1da fixed call of unknown function (1450464) 2006-03-15 17:41:27 +00:00
Roland Gruber 77ae253463 readded time zone for logon hours 2006-03-15 14:12:59 +00:00
Roland Gruber c8c7125e04 allow descriptive select fields 2006-03-14 17:58:52 +00:00
Roland Gruber c0e3d21ca7 fixed NT hash 2006-03-08 19:36:01 +00:00
Roland Gruber 7bb630c2c7 merged password hash settings 2006-03-06 17:09:17 +00:00
Roland Gruber a8e5513218 added textarea 2006-03-06 15:29:36 +00:00
Roland Gruber bfc0acdaa1 fixed help entry 2006-03-04 12:30:20 +00:00
Roland Gruber baec36cece replaced submit/abort with ok/cancel 2006-03-04 10:49:55 +00:00
Roland Gruber 1ce2b98103 Copyright updates 2006-03-03 17:30:35 +00:00
Roland Gruber 9727fdb061 added Tim's patch 2006-02-27 13:26:35 +00:00
Roland Gruber 2702a84ddd added Solaris patch 2006-02-27 13:22:00 +00:00
Roland Gruber 68065a5715 added global search and some documentation 2006-02-25 09:48:22 +00:00
Roland Gruber 88f07bfc1a sambaPwdLastSet for upload accounts 2006-02-25 09:30:17 +00:00
Roland Gruber ab55acb8b8 set shadowLastChange 2006-02-23 18:48:20 +00:00
Roland Gruber 14bf605dd8 fixed error handling 2006-02-23 14:12:14 +00:00
Roland Gruber 6892cd13d7 allow $ in logon script 2006-02-23 08:49:42 +00:00
Roland Gruber 55a49a6e51 allow $ at the end of \"cn\" (needed for hosts) 2006-02-23 08:37:37 +00:00
Roland Gruber 6ca099161c fixed creating of secondary accounts 2006-02-23 08:30:59 +00:00
Roland Gruber f9a7b34d6d fixed warnings about mktime() 2006-02-23 08:22:22 +00:00
Roland Gruber 880e296429 mark domain as required 2006-02-14 21:23:04 +00:00
Roland Gruber a691ea4b4d less restrictive date check 2006-02-12 11:03:20 +00:00
Roland Gruber 70171bea52 changed to natural sorting 2006-02-11 13:29:27 +00:00
Roland Gruber 3c0a8ab72b fixed getdate() warnings 2006-02-11 13:19:27 +00:00
Roland Gruber 402d578c02 PHPDoc update 2006-02-07 16:05:37 +00:00
Roland Gruber 714b756bb2 fixed loading of empty values 2006-02-03 15:36:39 +00:00
Roland Gruber 629f3e8c49 fixed login problems for AD servers 2006-02-02 19:56:41 +00:00
Roland Gruber ede8c042a0 added save_attributes() to baseModule, removed obsolete module_ready() and module_complete() functions 2006-02-01 19:10:51 +00:00
Roland Gruber c7917dd760 less PHP notices 2006-01-25 18:31:19 +00:00
Roland Gruber 28d0a8e6b9 less PHP notices 2006-01-24 14:23:42 +00:00
Roland Gruber 35a0fac1ab base64 encoding for crypted data, fixes jpegPhoto problems 2006-01-24 14:22:39 +00:00
Roland Gruber b5f3813c83 less PHP notices 2006-01-23 19:26:16 +00:00
Roland Gruber c862b37ce3 fixed some PHP notices 2006-01-23 18:40:47 +00:00
Roland Gruber 25c792cf23 fixed email regex (patch 1403922) 2006-01-14 09:56:17 +00:00
Roland Gruber 70566adccd fixed translation 2006-01-07 11:07:45 +00:00
Roland Gruber 3f4babb6df updated to new list views 2006-01-06 10:47:43 +00:00
Roland Gruber 0c88f5d99d fixed image for invalid messages 2006-01-06 10:38:54 +00:00
Roland Gruber f6ba232bc8 fixed PDF and account deletion 2006-01-03 22:02:03 +00:00
Roland Gruber fdfc9f8dca merge with 0_6_dev branch 2006-01-01 16:30:05 +00:00
Roland Gruber a5df2be6a3 fixed management of special groups 2005-12-17 12:11:51 +00:00
Roland Gruber fa3cefd455 fixed PHP5 warning 2005-12-17 12:07:36 +00:00
Roland Gruber 0be3028c30 less restrictive input checks 2005-12-10 09:47:09 +00:00
Roland Gruber 659437af53 less restrictive input checks 2005-12-10 09:42:55 +00:00
Roland Gruber 91f9e62456 fixed help entries 2005-12-09 14:23:07 +00:00
Roland Gruber f8ec9b3880 fixed PHP5 warning 2005-12-06 14:47:57 +00:00
Roland Gruber ce8164b127 corrected homepage address 2005-12-05 19:09:04 +00:00
Roland Gruber 64cead3fdf implemented jpegPhoto support 2005-12-05 14:45:01 +00:00
Roland Gruber cc1de32737 fix for binary attributes 2005-12-05 14:27:47 +00:00
Roland Gruber 860f34f507 set gettext encoding 2005-12-04 10:27:19 +00:00
Roland Gruber 2574578953 fix problem with LDAP suffixes which are not exactly written like in configuration 2005-11-22 15:44:49 +00:00
Roland Gruber 9fc8b5a146 removed fixed subtitles 2005-11-16 13:23:57 +00:00
Roland Gruber c283b4ec75 fixed possible uninitialized $return 2005-11-14 12:39:32 +00:00
Roland Gruber d6d5c5954d fixed removing of postalAddress and facsimileTelephoneNumber 2005-11-12 10:18:54 +00:00
Roland Gruber 7458053b5e allow numbers in first/last name 2005-11-10 16:16:20 +00:00
Roland Gruber bbafd62e79 decreased length of input fields 2005-11-05 15:49:01 +00:00
Roland Gruber 36e8da2835 removed unreachable code 2005-11-04 09:52:06 +00:00
Roland Gruber e331c80977 fixed help entry 2005-11-03 12:14:28 +00:00
Roland Gruber 4269c46e1f fixed errors when schema is not readable 2005-11-02 12:17:39 +00:00
Roland Gruber 835583383b automatically add "$" to uid for hosts 2005-10-26 09:24:20 +00:00
Roland Gruber 1135c5d709 allow "$" as last character in common name (needed for old hosts) 2005-10-26 09:23:44 +00:00
Roland Gruber 80b77d202a removed unused messages 2005-10-25 18:43:17 +00:00
Roland Gruber a7bc80de79 removed double sorting 2005-10-25 18:39:42 +00:00
Roland Gruber 77f56fe462 simplify sorting, fixes bug with mixed string and numeric values 2005-10-25 18:17:01 +00:00
Roland Gruber 8a21d03cba allow spaces and \"-\" in filter 2005-10-25 18:01:30 +00:00
Roland Gruber 6e083bd690 allow spaces in profile names and fixed magic_quotes_gpc problem 2005-10-23 09:26:18 +00:00
Roland Gruber 731692e511 fixed homedir creation 2005-10-21 13:48:30 +00:00
Roland Gruber 7bba828706 added SSH module 2005-10-20 10:52:36 +00:00
Roland Gruber c6c1c81f05 show \"*required\" not on main page 2005-10-20 10:40:18 +00:00
Roland Gruber d9fc93c39c reduced memory usage in cache by removing scope "*", removed update_cache() function 2005-10-15 09:33:05 +00:00
Roland Gruber fcfbdec26a loading of domain setting from profile did not work 2005-10-13 16:03:51 +00:00
Roland Gruber 414365bf48 removed time zone shifting, logon hours are always local time 2005-10-13 15:36:29 +00:00
Roland Gruber bdb5cff592 code cleanup: removed obsolete parameter from get_pdfentries() and updated PHPDoc comments 2005-10-09 18:05:32 +00:00
Roland Gruber 4517a59f6d fixed logon hours (patch 1311915) 2005-10-09 10:32:21 +00:00
Roland Gruber 1e0c6be290 fixed additional group handling 2005-10-08 14:35:30 +00:00
Roland Gruber 4f8ef06aef updated debug documentation 2005-10-07 16:07:07 +00:00
Roland Gruber 18a39aeb50 fixed again inode/block limit comparison 2005-10-04 15:32:42 +00:00
Roland Gruber f198964c2e fixed inode/block limit comparison 2005-10-04 15:25:42 +00:00
Roland Gruber 2ad1394b20 fixed passwords on file upload 2005-10-04 15:17:24 +00:00
Roland Gruber ab4adf6a61 added error message if no domains were found 2005-10-03 10:49:48 +00:00
Roland Gruber e6693bbfb2 fixed error message 2005-10-03 10:48:13 +00:00
Roland Gruber 98fe55d275 fixed test command 2005-10-03 10:41:16 +00:00
Roland Gruber 6b3df57f59 added sambaKickoffTime 2005-10-01 07:26:32 +00:00
Roland Gruber f388816737 added defaults for expiration date 2005-10-01 07:23:57 +00:00
Roland Gruber 779048bdf3 fixed mobile telephone number 2005-09-27 12:54:44 +00:00
Roland Gruber a211a7838f improved error handling 2005-09-27 12:47:22 +00:00
Roland Gruber 3a208b38a3 fixed additional groups in PDF 2005-09-27 12:41:38 +00:00
Roland Gruber 197adebee1 fixed autoUID/GID 2005-09-27 12:34:04 +00:00
Roland Gruber 8da59685fa fixed some cache calls 2005-09-26 11:57:17 +00:00
Roland Gruber f65c7995bb fixed missing object classes on DN renaming 2005-09-20 15:45:36 +00:00
Roland Gruber 3495c51e9d allow to set no drive letter 2005-09-20 15:36:58 +00:00
Roland Gruber d217dd78b3 changed regex for mailLocalAddress 2005-09-20 14:40:11 +00:00
Roland Gruber 4c5f43ffdd removed obsolete pages() and get_attributes() functions 2005-09-19 18:43:10 +00:00
Roland Gruber 3c0ebbb481 removed obsolete function 2005-09-19 18:39:05 +00:00
Roland Gruber 55b0dd5cce fixed reference problem 2005-09-19 18:37:05 +00:00
Roland Gruber adaf8f29ba fixed loading of account flags 2005-09-17 08:54:40 +00:00
Roland Gruber ef8fc73d78 made module ready even if no script path is set, solves blocking new users/groups 2005-09-13 17:20:07 +00:00
Roland Gruber 112b065ca6 added display name, fixed profile settings for Samba 3 2005-09-13 07:55:03 +00:00
Roland Gruber f05f0f52ae added hint for required fields 2005-09-13 07:51:48 +00:00
Roland Gruber 6a3e7ef33f added missing help entries 2005-09-12 15:37:23 +00:00
Roland Gruber 2f9d5d935c fixed problem with new accounts 2005-09-12 15:36:05 +00:00
Roland Gruber 4689680855 no longer allow integer results from process_..., updated documentation 2005-09-07 12:58:34 +00:00
Roland Gruber 4d769306f3 updated documentation and check email on old accounts, too 2005-09-04 17:45:30 +00:00
Roland Gruber a0df65be5b get group names by cn attribute, not DN 2005-09-04 16:53:43 +00:00
Roland Gruber 9dc9ef5f27 fixed call-by-reference warning 2005-09-04 12:49:26 +00:00
Roland Gruber abcd141a87 fixed help and profile loading 2005-09-03 10:59:50 +00:00
Roland Gruber d83df7a446 changed subpage handling; fixed another magic_quotes_gpc bug 2005-09-01 15:20:15 +00:00
Roland Gruber d1ea4ce0ab removed obsolete functions 2005-09-01 15:17:03 +00:00
Roland Gruber d1c5896b44 removed obsolete functions 2005-09-01 15:11:11 +00:00
Roland Gruber 1798bbc165 added missing help entry for deleting homedirs 2005-08-30 16:05:16 +00:00
Roland Gruber 26f7b52a08 renamed delete flag functions to avoid conflict with delete.php 2005-08-30 15:59:44 +00:00
Roland Gruber e0d76141d5 added button status 2005-08-26 08:53:16 +00:00
Roland Gruber 35b8fa72a0 another small layout change for the module buttons 2005-08-24 18:08:23 +00:00
Roland Gruber e77059d98f module buttons now have the same width 2005-08-24 17:53:03 +00:00
Roland Gruber c153540d97 enhanced button sorting algorithm 2005-08-23 12:16:58 +00:00
Roland Gruber c1dec7b548 added time zone information to logon hours help 2005-08-21 17:14:00 +00:00
Roland Gruber 170ece4874 small fix for meta HTML generation 2005-08-21 17:12:30 +00:00
Roland Gruber 399dd71840 PHPDoc update 2005-08-17 19:44:40 +00:00
Roland Gruber 1cb9b17cf3 force mail attribute in inetOrgPerson for new accounts 2005-08-17 09:29:47 +00:00
Roland Gruber a06115e7db force setting a password 2005-08-16 12:06:13 +00:00
Roland Gruber 0bc5a03b66 fixed password conflict with posixAccount 2005-08-16 12:04:09 +00:00
Roland Gruber 60482cd0cc added password dialog if posixAccount is not active 2005-08-15 18:36:56 +00:00
Roland Gruber d59061505d fixed password dialog and some typos 2005-08-15 18:10:38 +00:00
Roland Gruber fc06fd0553 sync with current PLA 2005-08-15 10:26:57 +00:00
Roland Gruber eee5289876 code cleanup and updated documentation 2005-08-14 11:38:06 +00:00
Roland Gruber aba6954571 fixed login problems 2005-08-13 16:38:56 +00:00
Roland Gruber 8e034e05f3 allow user accounts which only use the account module 2005-08-13 12:21:30 +00:00
Roland Gruber b4d6ea7c8c added new option in meta HTML code to not sort select lists 2005-08-13 11:31:26 +00:00
Roland Gruber b68a6064ba make sure that RDN attributes have correct order 2005-08-13 09:49:28 +00:00
Roland Gruber 4a4907a63a do not set RDN from profile if active modules do not support it 2005-08-13 09:38:32 +00:00
Roland Gruber 6aaae2094a code cleanup: added parent function for module_ready() and module_complete() which always return true to baseModule 2005-08-13 09:19:40 +00:00
Roland Gruber 9c71e24ac1 added PHPDoc comments 2005-08-12 13:18:05 +00:00
Roland Gruber 1c1afe71be get domain name from sambaSID not sambaDomainName 2005-08-12 12:44:13 +00:00
Roland Gruber 2221165957 removed obsolete TODO 2005-08-11 18:39:31 +00:00
Roland Gruber 98cc8373e7 input_check() now removes non-ASCII characters when found 2005-08-11 18:34:50 +00:00
Roland Gruber 579d94d031 another PHP5 related fix 2005-08-11 18:33:32 +00:00
Roland Gruber 0ac4c8800d removed Blowfish encryption because of bad performance 2005-08-10 19:18:35 +00:00
Roland Gruber 7813719af6 fixed bug with group memberships 2005-08-08 09:31:04 +00:00
Roland Gruber 1df507d3d4 temporarily deactivated update_cache() calls 2005-08-08 09:26:19 +00:00
Roland Gruber 766fe93cba removed userPassword() function from posixAccount.inc 2005-08-06 08:04:36 +00:00
Roland Gruber b81622783a fixed bug when no_password option is used 2005-08-06 08:01:27 +00:00
Roland Gruber f91528eff2 removed password encryption in session, fixed password bugs 2005-08-05 09:42:49 +00:00
Roland Gruber f3f37da4a6 encrypt sensitive parts of accountContainer in session 2005-08-05 08:49:03 +00:00
Roland Gruber 7fd7947fa6 removed obsolete TODO 2005-08-04 15:07:25 +00:00
Roland Gruber 48e390159f added message when a selected module is not yet ready 2005-08-02 19:06:29 +00:00
Roland Gruber cd31c1ba13 fixed module order and some minor bugs; removed unneeded parameter in get_pdfEntries() 2005-08-02 09:48:55 +00:00
Roland Gruber 19e65ecdab added Kolab support 2005-08-01 11:58:07 +00:00
Roland Gruber 43b3fd5dd6 fixed delete bug 2005-07-30 09:01:56 +00:00
Roland Gruber 0d57a4765e fixed typo 2005-07-29 12:09:31 +00:00
Roland Gruber c2de13f7c1 added <tr> tag for PDF to fix layout issues 2005-07-28 09:01:41 +00:00
Roland Gruber fdefad666f moved PDF templates to config/pdf (code from Lukas) 2005-07-27 18:38:17 +00:00
Roland Gruber 924910d030 moved PDF templates to config/pdf (code from Lukas) 2005-07-27 18:27:24 +00:00
Roland Gruber f5ad2e6566 allow \"@\" in cn attribute 2005-07-26 09:54:35 +00:00
Roland Gruber 6ccf0e37da fixed error messages on deletion 2005-07-26 09:49:31 +00:00
Roland Gruber fb0bf616df message text is now optional (code from Lukas) 2005-07-23 09:17:14 +00:00
Roland Gruber 2376d7782a added PHPDoc comments and removed obsolete check_attributes() function 2005-07-21 11:22:59 +00:00
Roland Gruber 7de3e699bb PHPDoc updates 2005-07-21 10:33:02 +00:00
Roland Gruber f8a171cf93 added basic PHPDoc comments 2005-07-20 18:07:10 +00:00
Roland Gruber 6390c15b69 added basic PHPDoc comments 2005-07-20 17:51:59 +00:00
Roland Gruber 63baed9d27 documented status messages 2005-07-20 10:04:07 +00:00
Roland Gruber 38360012ab implemented upload 2005-07-19 12:21:10 +00:00
Roland Gruber f694cb93f4 use correct function to get list of PDF structures 2005-07-18 15:55:54 +00:00
Roland Gruber e36398666d fixed some layout problems 2005-07-18 15:31:51 +00:00
Roland Gruber ffd38f7cc3 fixed Write() function 2005-07-18 14:48:06 +00:00
Roland Gruber 9362e92c82 include line break fixes from Andrea Rossato 2005-07-18 10:56:39 +00:00
Roland Gruber 0ef7472634 use multiCell() to display entry values 2005-07-18 10:55:58 +00:00
Roland Gruber 78dda09764 fixed password changing in tree view 2005-07-17 09:27:43 +00:00
Roland Gruber a4fe603233 fixed PDF output 2005-07-16 12:43:48 +00:00
Roland Gruber dda4473cbd use smaller font for entries 2005-07-16 12:42:45 +00:00
Roland Gruber 4890ef5dd8 fixed meberUid in PDF 2005-07-15 13:34:29 +00:00
Roland Gruber ee87d6f6cd updated PDF functions 2005-07-13 17:26:28 +00:00
Roland Gruber 00bc52f6e6 allow $ in UNC paths (for $user/$group) 2005-07-11 19:01:06 +00:00
Roland Gruber 8cf0ea5911 profile input boxes now have the same size 2005-07-11 18:56:23 +00:00
Roland Gruber 6be9971a0e profile options were not correctly saved if in subtable 2005-07-11 18:53:53 +00:00
Roland Gruber 4ab743eb9c fixed profile checks 2005-07-07 13:45:55 +00:00
Roland Gruber e7554a8caf implemented logon hours management 2005-07-07 13:35:29 +00:00
Roland Gruber de42963447 fixed array_merge_recursive calls 2005-07-06 13:35:54 +00:00
Roland Gruber 52ba9a07ac fixed array_merge fix :( 2005-07-05 14:46:53 +00:00
Roland Gruber 8c454749cc fixed array_merge call 2005-07-05 14:39:12 +00:00
Roland Gruber 057ccdd4c4 fixed another problem with \"unset\" and PHP5 2005-07-05 14:33:46 +00:00
Roland Gruber eadba74914 removed obsolete attributes from __sleep() 2005-07-05 13:00:23 +00:00
Roland Gruber 2287293f47 fixed problem with access to nonexistant session variable 2005-07-05 12:48:15 +00:00
Roland Gruber 35d175450f added td:width for meta HTML code; 
fixed problem with module order and PHP5
 2005-07-05 12:46:53 +00:00
Roland Gruber d82f21feff reordered some lines because PHP5 is more strict on using "unset" 2005-07-04 16:44:36 +00:00
Roland Gruber 04e5764956 added sambaSID as possible RDN attribute 2005-07-02 12:15:25 +00:00
Roland Gruber 622583a764 added manager and post office box 2005-07-02 12:05:33 +00:00
Roland Gruber e490ec98fb added regex for DNs 2005-07-02 12:03:49 +00:00
Roland Gruber a46462e237 fixed handling of special accounts 2005-06-30 16:22:58 +00:00
Roland Gruber 56e6e41b22 removed \"-\" in front of section headlines 2005-06-28 16:33:06 +00:00
Roland Gruber 0d3d79aff3 fixed PDF output 2005-06-28 15:58:22 +00:00
Roland Gruber 96fcbea888 fixed host accounts 2005-06-26 07:53:48 +00:00
Roland Gruber 47d857ba81 fixed reading of possible PDF entries 2005-06-19 09:40:30 +00:00
Roland Gruber 697893fbc0 made inetOrgPerson independent from posixAccount 2005-06-19 09:38:44 +00:00
Roland Gruber c15f355e19 fixed typos 2005-06-18 16:12:01 +00:00
Roland Gruber 1a6647b9c9 inetOrgPerson currently needs posixAccount for uid/cn 2005-06-17 09:47:40 +00:00
Roland Gruber 88300017a2 removed obsolete non-UTF-8 fonts 2005-06-17 08:00:21 +00:00
Roland Gruber 8b0b58257a use UTF-8 font Bitstream Vera 2005-06-17 07:57:55 +00:00
Roland Gruber cd15d70d15 added Unicode extension for fpdf 2005-06-13 16:34:31 +00:00
Roland Gruber 844868d131 added Bitstream Vera font (UTF-8) 2005-06-13 16:29:54 +00:00
Roland Gruber fc2b2021a5 fixed PDF output 2005-06-12 19:47:54 +00:00
Roland Gruber c9b305523b fixed PDF output 2005-06-12 19:41:49 +00:00
Roland Gruber 14cea94915 updated to 1.53 2005-06-12 16:13:26 +00:00
Roland Gruber a2a3fb9bde fixed error messages when getgid() is called for nonexisting group 2005-06-11 11:20:45 +00:00
Roland Gruber d58048c975 upload: check for existing users and groups 2005-06-08 21:02:01 +00:00
Roland Gruber 675a666497 added auto value for GECOS in upload 2005-06-07 18:28:28 +00:00
Roland Gruber b7cbe60f61 fixed optional upload values 2005-06-07 18:19:48 +00:00
Roland Gruber ca78b15377 added Unix workstations for upload 2005-06-06 19:24:48 +00:00
Roland Gruber 7546f7efd2 fixed regex for Unix workstations 2005-06-06 19:24:23 +00:00
Roland Gruber 650ba7e4f4 added export feature for tree view 2005-06-05 10:51:10 +00:00
Roland Gruber c306e4b31b fixed help links for profile editor 2005-06-03 17:30:56 +00:00
Roland Gruber a532872c30 removed TODOs 2005-06-03 17:17:39 +00:00
Roland Gruber ed3ccd66fe fixed help entries 2005-06-02 20:30:18 +00:00
Roland Gruber ec2328cace fixed getgid function 2005-06-02 19:11:45 +00:00
Roland Gruber 3c878e75be added updates from PLA 0.9.6c 2005-05-29 10:39:31 +00:00
Roland Gruber f5035cc2bb set DN suffix and RDN on profile loading 2005-05-22 09:05:33 +00:00
Roland Gruber eb71557f54 better error handling 2005-05-10 16:51:32 +00:00
Roland Gruber 200e7e6c1a fixed lm/ntPassword and pwdLastSet 2005-05-10 15:34:43 +00:00
Roland Gruber fe48b1f53f fixed RID 2005-05-10 15:02:58 +00:00
Roland Gruber 1f3b8614b0 fixed profile loading 2005-05-08 16:50:13 +00:00
Roland Gruber 64fd21a6f0 fixed saving of nonset attributes 2005-05-08 16:37:36 +00:00
Roland Gruber 0f3d478e20 fixed sambaLM/NTPassword values 2005-05-08 12:39:29 +00:00
Roland Gruber 113622c7f0 fixed sambaPrimaryGroupSID value 2005-05-08 11:04:32 +00:00
Roland Gruber d98f36cad4 fixed double password entries for new accounts 2005-05-08 10:36:18 +00:00
Roland Gruber 9728ab3556 info messages no longer block changing modules; 
better messages if some required information is still missing
 2005-05-07 14:32:18 +00:00
Roland Gruber 48cc835ade use no printf when not needed 2005-05-06 13:15:27 +00:00
Roland Gruber 68a6a94454 use new cache functionality 2005-05-05 13:53:27 +00:00
Roland Gruber 5ff78daf76 use cn attribute to read group name, not DN 2005-05-05 13:28:54 +00:00
Roland Gruber 4bab674b29 removed unused code 2005-05-05 13:12:02 +00:00
Roland Gruber fca21dbdf8 use new cache functionality for finding possible new memberUIDs 2005-05-05 13:07:34 +00:00
Roland Gruber 4211e548da implemented query for multiple attributes (task #114873) 2005-05-05 10:03:46 +00:00
Roland Gruber 5e97605681 removed checks if attribute and objectclass are in schema 2005-05-04 12:33:47 +00:00
Roland Gruber 7260a8c409 moved password fields to subpage (task #114875) 2005-05-03 14:46:06 +00:00
Roland Gruber b8a99ec1e3 count entries are now removed in modules.inc:load_account() 2005-05-02 18:14:58 +00:00
Roland Gruber b63b876aba added RDN selection (task #107567) 2005-05-02 17:41:09 +00:00
Roland Gruber 1655f7c711 added boolean to check if account is new or loaded from LDAP (task #114874) 2005-04-29 15:20:48 +00:00
Roland Gruber b3189b50d5 added help link for filters 2005-04-24 13:14:15 +00:00
Roland Gruber d9e3ee720f fixed getAvailablePDFFields() 2005-04-24 10:35:26 +00:00
Roland Gruber 2551c825b6 changed help links to icons 2005-04-23 16:54:34 +00:00
Roland Gruber 2c762b1d84 fixed group selection 2005-04-23 14:26:22 +00:00
Roland Gruber 8301e5aff3 fixed alignment in member selection 2005-04-23 14:25:40 +00:00
Roland Gruber 67e22d8dcf fixed member selection 2005-04-22 13:33:34 +00:00
Roland Gruber 5bfcf6f0fc changed CSS for fieldsets 2005-04-22 08:56:47 +00:00
Roland Gruber ff0e65a538 encrypt cache content in session file 2005-04-19 18:43:53 +00:00
Roland Gruber b29106b783 replaced load_ldap_attributes with parent class function call 2005-04-16 13:41:17 +00:00
Roland Gruber f681a189c9 load default profile for new accounts 2005-04-16 10:58:18 +00:00
Roland Gruber 63064fa7b6 email and givenname are optional 2005-04-16 10:45:39 +00:00
Roland Gruber fb89aaa120 more general list functions in config.inc, 
put attribute-description code in lists.inc
 2005-04-14 17:42:15 +00:00
Roland Gruber ab44ea6afc better error handling if no Unix groups exist 2005-04-12 19:38:32 +00:00
Roland Gruber 5a263dbea3 added function for version information 2005-04-07 13:12:38 +00:00
Roland Gruber 52fd5c9ccd added regex for country names 2005-04-07 13:10:15 +00:00
Roland Gruber f516106e4a fixed help links in parseHTML() if called from templates/ 2005-04-05 12:04:37 +00:00
Roland Gruber 82b4345780 fixed display of homedir checkbox on account deletion 2005-04-05 11:43:19 +00:00
Roland Gruber 09f2ccf873 added dummy functions for delete.php 2005-04-04 16:54:10 +00:00
Roland Gruber e2b413a7b5 fixed unneeded dependencies 2005-04-04 15:57:35 +00:00
Roland Gruber 66b0edbdb6 added scope to parseHtml() and fixed loading of old values 2005-03-29 16:10:30 +00:00
Roland Gruber 2f3ba8f89c added profile specific code to parseHtml() 2005-03-29 14:33:31 +00:00
Roland Gruber 2bf5430737 moved parse_html function out of accountContainer and added image option 2005-03-29 10:05:08 +00:00
Roland Gruber 9203a3e869 fixed error messages 2005-03-26 11:27:48 +00:00
Roland Gruber 88ae108dec put autoUID generation in extra function 2005-03-25 14:21:07 +00:00
Roland Gruber 8c4c6b120e fixed problem if GIDs greater than maxGID exist 2005-03-25 14:20:26 +00:00
Roland Gruber 3d820bd98d fixed error handling in getNextGIDs() 2005-03-25 12:54:04 +00:00
Roland Gruber e65429cf0f put autoGID generation in extra function 2005-03-25 12:38:36 +00:00
Roland Gruber 0061cee082 get_<scope>Suffix() -> get_Suffix(<scope>) 2005-03-10 20:20:00 +00:00
Roland Gruber 2c60d5dc72 proccess -> process 2005-03-10 18:35:04 +00:00
Roland Gruber 53b8e701fc fixed some PHP notices 2005-03-05 13:26:46 +00:00
Roland Gruber 1888ebc53c implemented user+passwd in STDIN 2005-03-05 13:23:59 +00:00
Roland Gruber 3fe5a3a924 moved contents of include.inc to edit.php 2005-03-05 12:48:36 +00:00
Roland Gruber a116aa4b31 fixed error message for special groups 2005-03-03 20:26:54 +00:00
Roland Gruber 92ce7b810a added tree view 2005-02-27 12:40:06 +00:00
Roland Gruber 8fc845467a moved Java Script code to lists.inc, 
reduced differences between lists
 2005-02-26 14:32:52 +00:00
Roland Gruber a33f881f0d Java Script code is now in lists.inc 2005-02-26 14:32:02 +00:00
Roland Gruber 58081d88ff fixed another PHP notice 2005-02-24 20:50:48 +00:00
Roland Gruber 1e53b1bb16 fixed several PHP notices 2005-02-22 20:20:47 +00:00
Roland Gruber 360e580d79 fixed call-by-reference warnings 2005-02-16 21:00:19 +00:00
Roland Gruber ac5869b658 added schema browser 2005-01-30 15:39:01 +00:00
Roland Gruber 2b751c5d2a implemented profile loading 2005-01-29 15:14:13 +00:00
Roland Gruber 3c27a809b2 implemented profile loading 2005-01-29 12:05:16 +00:00
Roland Gruber dc2a192a8a fixed problem with spaces in DN 2005-01-27 22:14:01 +00:00
Roland Gruber 91ba8e753a moved handling of POST actions to lists.inc 2005-01-27 21:07:48 +00:00
Roland Gruber 92184d841e allow % in Samba profile/home path 2005-01-24 20:57:38 +00:00
Roland Gruber f6d7db5f07 added functions to filter account lists 2005-01-23 17:54:13 +00:00
Roland Gruber 6d1c6bf57f implemented profile loading 2005-01-23 12:15:03 +00:00
Roland Gruber e6beeaa933 added \"$\" to home directory regex 2005-01-22 10:57:48 +00:00
Roland Gruber e8f9e08f06 implemented profile loading 2005-01-22 10:50:10 +00:00
Roland Gruber 66f164dd6a implemented profile loading 2005-01-16 12:41:38 +00:00
Roland Gruber 514fdf62f8 fixed typo 2005-01-11 18:43:18 +00:00
Roland Gruber 50de4f707e fixed typo 2005-01-11 18:42:56 +00:00
Roland Gruber e278195766 updated LDAP filter for new base modules 2005-01-10 10:57:04 +00:00
Roland Gruber e0b36f32f5 changed meaning of base module (now: base module = contains structural object class) 2005-01-10 10:41:38 +00:00
Roland Gruber 8f3cb8d305 fixed typo in sambaGroupMapping, updated Hungarian translation 2005-01-09 14:36:44 +00:00
Roland Gruber 630f65a639 implemented profile loading interface 2005-01-07 10:55:05 +00:00
Roland Gruber 7327e2b4a8 added group module for alias management 2005-01-04 20:18:02 +00:00
Roland Gruber 3e2714225e fixed PDF output 2005-01-04 20:16:54 +00:00
Roland Gruber 520d97be03 added nis_recipient 2005-01-04 20:14:48 +00:00
Roland Gruber 8f9507dc2a added nis_alias for nisMailAlias module 2004-12-31 13:50:30 +00:00
Roland Gruber 670f4f142d removed help variables 2004-12-30 14:12:28 +00:00
Roland Gruber c0ea523001 mail routing module for user accounts 2004-12-29 08:50:04 +00:00
Roland Gruber e7f79fbb43 added DNS names as regex 2004-12-29 08:49:09 +00:00
Roland Gruber a631f759e5 add object class if not existing 2004-12-28 12:06:50 +00:00
Roland Gruber 2201198837 fixed schema parsing for single MUST/MAY attributes 2004-12-28 12:06:11 +00:00
Roland Gruber 7a0b0c6da6 added "*.exe" to Samba logon script regex 2004-12-17 16:52:11 +00:00
Roland Gruber cbf862c940 fixed host RID in upload code 2004-12-09 22:11:23 +00:00
Roland Gruber 0a3277510b fixed typo 2004-12-09 22:10:19 +00:00
Roland Gruber bdbc51933e added host upload 2004-12-09 21:40:39 +00:00
Roland Gruber 7dd57d4ef7 moved lamdaemon function to lamdaemon.inc 2004-12-09 19:10:57 +00:00
Roland Gruber 36194a18a1 Samba passwords are now calculated with PHP include file 2004-12-07 20:30:29 +00:00
Roland Gruber 5b356d9b6a fixed space at end of file 2004-12-07 20:23:48 +00:00
Roland Gruber 17638b7201 renamed createntlm.php to createntlm.inc 2004-12-07 20:19:55 +00:00
Roland Gruber 2d7dba0dbd added nthash 2004-12-06 17:24:25 +00:00
Roland Gruber 00704e1850 implemented LM password hashes 2004-12-04 12:21:28 +00:00
Roland Gruber 71cad288ea implemented upload for users 2004-12-01 12:59:14 +00:00
Roland Gruber a9bed956b0 translation update 2004-11-28 19:45:10 +00:00
Roland Gruber d3de89ecbe added Samba logon hours 2004-11-28 19:44:46 +00:00
Roland Gruber c97223eb05 some upload fixes 2004-11-28 15:56:59 +00:00
Roland Gruber 8f2cfeeba6 fixed regex for newer Apache releases 2004-11-21 11:54:27 +00:00
Roland Gruber 314c06ad28 added help 2004-11-20 12:44:56 +00:00
Roland Gruber fae4ff0fae finished upload 2004-11-20 12:44:09 +00:00
Roland Gruber 2c79564a0d fixed regex for date 2004-11-19 14:25:30 +00:00
Roland Gruber 5d57fb6444 started upload and added help entries 2004-11-17 19:14:26 +00:00
Roland Gruber 68a80b58a8 fixed help for profile options 2004-11-14 13:51:49 +00:00
Roland Gruber 2f0dee28ca small fix for config options 2004-11-14 13:50:57 +00:00
Roland Gruber f64a7f1049 replaced "Ordinary user" with "-" 2004-11-10 15:12:45 +00:00
Roland Gruber 53aaaf94a9 translation update 2004-11-10 14:00:00 +00:00
duergner c997e76021 Removed some unneeded text 2004-11-10 09:15:16 +00:00
Roland Gruber 696f5ab550 added upload 2004-11-08 19:48:39 +00:00
Roland Gruber a1fcb011bf added regex for date 2004-11-08 19:25:50 +00:00
Roland Gruber 92169bbb5d translation update 2004-11-07 13:25:48 +00:00
Roland Gruber 8a3c0a6bb3 translation update 2004-11-07 12:56:55 +00:00
Roland Gruber 3382811d84 translation update 2004-11-06 13:05:34 +00:00
Roland Gruber b7dd7e9a35 added more upload columns 2004-11-05 16:53:38 +00:00
Roland Gruber 23f9128d43 MAC addresses for host accounts 2004-11-01 16:53:04 +00:00
Roland Gruber f054eaf8b7 added MAC address 2004-11-01 11:50:42 +00:00
Roland Gruber 88499fee73 fixed upload for hosts 2004-11-01 11:49:43 +00:00
Roland Gruber bfd44cce86 fixed syntax error 2004-10-30 17:00:34 +00:00
duergner 6c97d892b3 *** empty log message *** 2004-10-30 16:46:06 +00:00
Roland Gruber 6f6f9607e8 removed unneeded functions from accountContainer 2004-10-28 19:37:40 +00:00
Roland Gruber 8dab54a16e surname => last name, given name => first name 2004-10-28 15:14:54 +00:00
Roland Gruber 7f5316c42d translation update 2004-10-27 18:07:00 +00:00
Roland Gruber 43a3bb780f translation update 2004-10-25 18:40:18 +00:00
Roland Gruber e1cb74c33b translation update 2004-10-25 11:08:21 +00:00
Roland Gruber e6f36aee4f translation update 2004-10-24 20:36:02 +00:00
Roland Gruber 8975b32018 translation update 2004-10-24 19:20:53 +00:00
katagia f4e4f2b3df Added "Umlaut" handling for attributes which don''t allow them. 
Added $this->attribute to ldap class. This variable contains a list
of all attributes and their syntax
 2004-10-24 17:23:23 +00:00
Roland Gruber 7a4ce78548 file upload: add users to groups 2004-10-24 09:50:02 +00:00
Roland Gruber ca07bf67d9 translation update 2004-10-23 12:11:38 +00:00
Roland Gruber dc12ee5a72 translation update and changes in file upload 2004-10-23 11:54:44 +00:00
Roland Gruber 33f11210da translation update 2004-10-23 11:53:30 +00:00
Roland Gruber 2849ad4faa translation update 2004-10-23 11:11:31 +00:00
Roland Gruber f792d03a85 updated file upload 2004-10-23 09:52:59 +00:00
Roland Gruber 7254cd87c8 added tooltip for filter boxes 2004-10-22 11:48:49 +00:00
Roland Gruber 4638db3d33 added post upload actions 2004-10-19 18:18:46 +00:00
Roland Gruber e7aca09b2c added messages for upload 2004-10-17 18:29:39 +00:00
Roland Gruber f46b56c921 added info message for upload errors 2004-10-17 15:55:26 +00:00
Roland Gruber f1bcd80883 fixed some module selections 2004-10-17 09:52:58 +00:00
Roland Gruber c4569c59ae marked "account" as user module 2004-10-17 09:44:21 +00:00
Roland Gruber ec33ddb514 renamed get/set_UserModules etc. to get_AccountModules($scope) 2004-10-17 09:36:36 +00:00
katagia e257ffcb5b made some fixes 2004-10-17 09:33:24 +00:00
katagia d8b02d37aa fixed password handling in sambaAccount module 
changed error code handling
 2004-10-16 19:51:36 +00:00
katagia b96fa3e32f added some information to module specification 2004-10-16 18:41:39 +00:00
Roland Gruber 9d3e4353d9 added basic upload functions 2004-10-16 14:28:06 +00:00
Roland Gruber 4ec2a4ef4f getshells() now returns an empty array if $_SESSION['lampath'] is not set 2004-10-16 13:58:08 +00:00
Roland Gruber 153da7bf86 fixed regex for email, added gecos 2004-10-16 11:30:08 +00:00
Roland Gruber 81c8bbd47d made "cn" first attribute for upload 2004-10-15 14:52:02 +00:00
Roland Gruber 9aac2700a4 check correctness of modules only once on load 2004-10-14 18:59:26 +00:00
Roland Gruber 5a49e69dc6 restricted domain search for upload to logged-in status 2004-10-14 14:11:36 +00:00
Roland Gruber 86bb6297c6 fixed including of module files 2004-10-14 14:09:44 +00:00
katagia 3216280f16 fixed smaller bus. 
I hope password handling is now ok
 2004-10-12 13:34:00 +00:00
Roland Gruber 5594631601 use "possible values" option in upload 2004-10-12 13:13:04 +00:00
Roland Gruber 49a50ec363 added upload code 2004-10-11 18:06:53 +00:00
katagia 08b99f008e fixed some little bugs. 
Changed get_preg to avoid possible php bug
 2004-10-11 12:20:27 +00:00
Roland Gruber 3e7773b38b fixed domain sorting and function_exists() calls 2004-10-10 18:08:19 +00:00
Roland Gruber a60e563431 added Samba group type to upload 2004-10-10 17:59:41 +00:00
Roland Gruber e161023278 removed optional required options in upload columns 2004-10-10 12:25:25 +00:00
Roland Gruber ff16dd9ed0 updated to new profile functions 2004-10-10 11:40:31 +00:00
Roland Gruber 5afddd33a9 updated to removed main module 2004-10-10 11:30:20 +00:00
katagia c5606519d1 fixed little bugs, mostly typos 2004-10-10 11:21:54 +00:00
Roland Gruber 96b3a08dc0 removed unneeded main module 2004-10-10 11:13:33 +00:00
katagia 799d9d1228 Added sambaGroupType as option 2004-10-09 14:15:56 +00:00
Roland Gruber 81aa810c0c added possibility to mark upload columns as containing unique entries 2004-10-09 11:09:53 +00:00
Roland Gruber e8a916a68b fixed error handling in upload code 2004-10-09 11:08:16 +00:00
Roland Gruber 6761f601c6 changed PHPDoc package 2004-10-09 11:04:20 +00:00
Roland Gruber 214d38571d fixed syntax error 2004-10-08 11:26:59 +00:00
Roland Gruber c811b1721c set language to English if not defined in session 2004-10-07 09:48:31 +00:00
Roland Gruber 6289fa7cc4 renamed profile management functions 2004-10-06 20:00:17 +00:00
Roland Gruber 921a0e1639 added getRDNAttributes() 2004-10-06 18:17:22 +00:00
Roland Gruber 81f7e5e847 improved error output for file upload 2004-10-03 18:06:57 +00:00
Roland Gruber 65dca8e09b added scope for config help entries, moved some Posix group entries to module 2004-10-02 18:45:11 +00:00
Roland Gruber 8b1fc57bea made pwdHash help entry more generic 2004-10-02 18:43:20 +00:00
Roland Gruber 4c30d35826 moved help entries to quota module 2004-10-02 17:41:42 +00:00
Roland Gruber dd5231ca9c modified default modules, added checks for module properties 2004-10-02 17:16:39 +00:00
Roland Gruber 68f0942727 moved cache creation from modules.inc to main.php 2004-10-02 16:40:02 +00:00
Roland Gruber c6d1ebc98d set character encoding in HTTP header 2004-10-02 12:06:03 +00:00
katagia c884687e1a removed utf8... code 
Changes language files to utf-8
 2004-10-01 12:13:16 +00:00
katagia 794b229a35 some fixes 2004-09-28 16:46:53 +00:00
katagia c58e2ba0ea fixed ne regexpr 2004-09-28 16:44:33 +00:00
katagia 174539d53f fixed problems. Sometimes Code was returned as unicode and not as local code 2004-09-28 16:42:12 +00:00
katagia 565a5a2c9e changed left menu.Don't use disabled buttons anymore 2004-09-28 15:41:16 +00:00
Roland Gruber 8ac15ce411 implemented account building for file uploads 2004-09-27 19:14:16 +00:00
Roland Gruber d4710f6141 fixed message loading 2004-09-27 19:12:22 +00:00
Roland Gruber eb8297385c fixed regex for user/group lists 2004-09-27 19:09:48 +00:00
Roland Gruber 7c49bb5aad added user/groupNameList 2004-09-27 16:51:17 +00:00
katagia 88d104d444 use dynamic_MEssage for dynamic info messages 2004-09-27 15:45:12 +00:00
Roland Gruber 5e771bff23 added regex checks and error messages to build_uploadAccounts() 2004-09-26 17:39:27 +00:00
Roland Gruber 2c991d9075 use preg-checks 2004-09-26 15:55:29 +00:00
Roland Gruber 61dffc68ac added preg-checks for profiles and config 2004-09-26 15:45:40 +00:00
Roland Gruber 941bd55d8f fixed config error messages 2004-09-26 14:56:34 +00:00
Roland Gruber 7373059701 changed messages 2004-09-26 14:51:18 +00:00
katagia 37da9db821 fixed two problems 2004-09-26 13:55:27 +00:00
katagia e53a3874cb added new get_preg function. Changed all modules to use get_reg 
Changed Status Messages in Module. Thex are now all stored in a single array.
Changed Password handling in psoxGroup and posixAccount
 2004-09-26 13:48:52 +00:00
katagia bbc8ef2b6d changed errrormessage to message 2004-09-26 13:37:54 +00:00
Roland Gruber 44a5799b90 updated help links 2004-09-26 11:18:05 +00:00
Roland Gruber 9db54170a1 updated help entries for posixGroup 2004-09-26 10:58:36 +00:00
Roland Gruber 66fa43498a phpdoc update 2004-09-26 08:46:56 +00:00
Roland Gruber 6c90cdc350 fixed password attribute for upload 2004-09-25 15:11:15 +00:00
Roland Gruber 1316556a7a added additional parameter checks 2004-09-25 13:38:56 +00:00
Roland Gruber d6c8b2ed78 load error messages in constructor 2004-09-25 10:13:32 +00:00
Roland Gruber 587e81be8f removed load_errormessages, must be implemented and called in submodules 2004-09-25 10:07:23 +00:00
Roland Gruber 9afa90dacc fixed loading of errormessages, moved config messages to errormessages 2004-09-25 10:02:56 +00:00
katagia 187f537a08 renamed get_ereg in get_preg function. Made get_preg work with non standard letters. 
Fix password handling in posixGroup

function get_preg should wor fine now
 2004-09-24 16:32:46 +00:00
katagia 21c929f642 added new regexpr function in account.inc 2004-09-23 11:30:20 +00:00
Roland Gruber afa8899ad3 fixed objectclass setting for upload 2004-09-21 18:32:44 +00:00
katagia a7146384fd fixed get_errorMessages in basemodule 2004-09-21 11:46:02 +00:00
katagia a4a0a2f255 changed function order in module. 
First are all function variables, second constructor.
All other functions will follow in alphabetical order
 2004-09-21 11:33:00 +00:00
katagia 9b4c88bcdf changed function order in module. 
First are all function variables, second constructor.
All other functions will follow in alphabetical order
 2004-09-21 11:14:22 +00:00
katagia 3755ef4bb8 added new error handling 2004-09-21 10:43:29 +00:00
katagia 0aa6874931 changed error message handling in posixGroup 2004-09-20 19:33:31 +00:00
katagia 25f5991ec0 improved modules 2004-09-20 18:25:18 +00:00
Roland Gruber 50c991fe48 modified buildUploadAccounts() 2004-09-19 16:04:37 +00:00
katagia bc73e501cc fixed problem by optimations yesterday 2004-09-19 09:50:31 +00:00
Roland Gruber 2ed32f3ca0 moved Samba 3 domain object to account.inc 2004-09-19 08:35:01 +00:00
Roland Gruber b9fe20574f documentation update 2004-09-19 08:34:14 +00:00
Roland Gruber a3af830659 start of building upload accounts 2004-09-19 08:33:37 +00:00
Roland Gruber 2ab987047e updated comments, changed build_uploadAccounts function 2004-09-19 08:28:03 +00:00
Roland Gruber aa8028235f next step for file upload - buildUploadAccounts partially implemented 2004-09-19 08:26:33 +00:00
katagia 8e3e173dac optimized code 2004-09-18 18:44:47 +00:00
Roland Gruber 275c3d4d5f moved password functions to account.inc 2004-09-16 17:25:42 +00:00