Index: branches/unlabeled/unlabeled-1.52.2/admin/install/inportal_data.sql =================================================================== diff -u -r3870 -r3946 --- branches/unlabeled/unlabeled-1.52.2/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3870) +++ branches/unlabeled/unlabeled-1.52.2/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3946) @@ -53,6 +53,7 @@ INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 16, 0); INSERT INTO ConfigurationAdmin VALUES ('UseJSRedirect', 'la_Text_Website', 'la_config_use_js_redirect', 'checkbox', '', '', 17, 0); INSERT INTO ConfigurationAdmin VALUES ('MaxImportCategoryLevels', 'la_Text_General', 'la_prompt_max_import_category_levels', 'text', '', '', 9, 1); +INSERT INTO ConfigurationAdmin VALUES ('UseCronForRegularEvent', 'la_Text_Website', 'la_UseCronForRegularEvent', 'checkbox', NULL, NULL, 18, 0); INSERT INTO ConfigurationValues VALUES ('Columns_Category', '2', 'In-Portal', 'Categories') INSERT INTO ConfigurationValues VALUES ('DomainSelect','1','In-Portal','in-portal:configure_general') @@ -182,6 +183,7 @@ INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('UseJSRedirect', '0', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories'); +INSERT INTO ConfigurationValues VALUES ('UseCronForRegularEvent', '0', 'In-Portal', 'in-portal:configure_general'); INSERT INTO Events VALUES (30, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0) INSERT INTO Events VALUES (32, 'USER.ADD', 2, 0, 'In-Portal:Users', 'la_event_user.add', 1) Index: branches/unlabeled/unlabeled-1.41.2/admin/install/inportal_schema.sql =================================================================== diff -u -r3938 -r3946 --- branches/unlabeled/unlabeled-1.41.2/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 3938) +++ branches/unlabeled/unlabeled-1.41.2/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 3946) @@ -584,7 +584,7 @@ email varchar(255) NOT NULL default '', sent double, PRIMARY KEY (email) -) +) # -------------------------------------------------------- Index: branches/unlabeled/unlabeled-1.72.10/admin/install/langpacks/english.lang =================================================================== diff -u -r3941 -r3946 --- branches/unlabeled/unlabeled-1.72.10/admin/install/langpacks/english.lang (.../english.lang) (revision 3941) +++ branches/unlabeled/unlabeled-1.72.10/admin/install/langpacks/english.lang (.../english.lang) (revision 3946) @@ -1,5 +1,5 @@ - m/d/Yg:i:s A.,iso-8859-12 + m/d/Yg:i:s Am/d/Yg:i:s A.,iso-8859-12 WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gWW91IHdpbGwgcmVjZWl2ZSB5b3VyIG5ldyBwYXNzd29yZCBpbiB0aGUgZW1haWwgc2hvcnRseS4= QWN0aXZl @@ -1377,6 +1377,7 @@ VW5jaGFuZ2Vk VXBkYXRpbmcgQ29uZmlndXJhdGlvbg== VXBkYXRpbmcgUnVsZXM= + VXNlIENyb24gZm9yIFJ1bm5pbmcgUmVndWxhciBFdmVudHM= QWxsb3cgbmV3IHVzZXIgcmVnaXN0cmF0aW9u QXNzaWduIEFsbCBVc2VycyBUbyBHcm91cA== VmFsaWRhdGUgZS1tYWlsIGFkZHJlc3M= @@ -1496,6 +1497,7 @@ RW1haWxBZGRyZXNz Tm8gUGVybWlzc2lvbnM= UHJvZHVjdCBEZXNjcmlwdGlvbg== + Q29tcGFueQ== Y29uZmlybQ== Q29uZmlybWF0aW9uIFRpdGxl WW91IGFyZSBhYm91dCB0byBkZWxldGUgdGhlIGxpbmsgYmVsb3cu Index: branches/unlabeled/unlabeled-1.10.2/admin/head.php =================================================================== diff -u -r3908 -r3946 --- branches/unlabeled/unlabeled-1.10.2/admin/head.php (.../head.php) (revision 3908) +++ branches/unlabeled/unlabeled-1.10.2/admin/head.php (.../head.php) (revision 3946) @@ -1,7 +1,7 @@ recallObject('u'); $loginname = ($user->GetID() != -1) ? $user->GetDBField('Login') : 'root'; - + $logout = $application->HREF('', '', Array('logout' => 1, '__URLENCODE__' => 1), 'index.php'); $mainpage = $application->HREF('', '', Array('section' => 'in-portal:root', '__URLENCODE__' => 1), 'subitems.php'); $xmlhttp_url = $application->HREF('', '', Array('check_server' => 1, '__URLENCODE__' => 1)); - + $language =& $application->recallObject('lang.current'); - + $use_xml = $application->isDebugMode() && dbg_ConstOn('DBG_SHOW_EXPIRATION'); ?> @@ -60,7 +60,7 @@ } return http_request; } - + function processResponce(http_request) { if (http_request.readyState == 4) { if (http_request.status == 200) { @@ -69,7 +69,7 @@ // alert('There was a problem with the request.'); } } - + } ' : ' '; - ?> + ?> - + Phrase('la_Logged_in_as').' '.$loginname.' '; ?> - + - +