Changeset 11670
- Timestamp:
- 08/22/07 17:42:15 (1 year ago)
- Files:
-
- trunk/midcom/midcom.admin.settings/config/manifest.inc (modified) (1 diff)
- trunk/midcom/midcom.admin.settings/config/schemadb_config.inc (modified) (60 diffs)
- trunk/midcom/midcom.admin.settings/documentation (added)
- trunk/midcom/midcom.admin.settings/documentation/CHANGES (added)
- trunk/midcom/midcom.admin.settings/editor.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.admin.settings/config/manifest.inc
r5819 r11670 1 2 'name' => 'midcom.admin.settings', 3 'description' => 'This module handles MidCOM local configuration.', 4 'purecode' => true, 5 'version' => '0.1.5beta1', 6 'state' => 'beta', 7 'privileges' => 8 array ( 9 ), 10 'class_definitions' => 11 array ( 12 ), 13 'package.xml' => 14 array ( 1 'name' => 'midcom.admin.settings', 2 'description' => 'This module handles MidCOM local configuration.', 3 'purecode' => true, 4 'version' => '0.1.5beta2', 5 'state' => 'beta', 6 'privileges' => array (), 7 'class_definitions' => array (), 8 'package.xml' => array 9 ( 15 10 'license' => 'LGPL', 16 'maintainers' => 17 array ( 18 'solt' => 19 array ( 20 'name' => 'Marcin SoÅtysiak', 21 'email' => 'olga@olga.pl', 22 'role' => 'lead', 23 ), 24 'bergie' => 25 array ( 26 'name' => 'Henri Bergius', 27 'email' => 'henri.bergius@iki.fi', 28 'role' => 'developer', 29 ), 11 'maintainers' => array 12 ( 13 'solt' => array 14 ( 15 'name' => 'Marcin SoÅtysiak', 16 'email' => 'olga@olga.pl', 17 'role' => 'lead', 18 ), 19 'bergie' => array 20 ( 21 'name' => 'Henri Bergius', 22 'email' => 'henri.bergius@iki.fi', 23 'role' => 'developer', 24 ), 25 'adrenalin' => array 26 ( 27 'name' => 'Arttu Manninen', 28 'email' => 'arttu@kaktus.cc', 29 'role' => 'developer', 30 ), 30 31 ), 31 'dependencies' => 32 array ( 33 'midcom.helper.datamanager2' => 34 array ( 35 ), 36 'midcom' => 37 array ( 38 ), 32 'dependencies' => array 33 ( 34 'midcom.helper.datamanager2' => array (), 35 'midcom' => array (), 36 'midcom.admin.folder => array (), 39 37 ), 40 ),38 ), trunk/midcom/midcom.admin.settings/config/schemadb_config.inc
r11645 r11670 30 30 ), 31 31 32 'auth_frontend' => array32 'auth_frontend' => array 33 33 ( 34 34 'title' => 'auth_frontend', … … 45 45 ), 46 46 47 'auth_sitegroup_mode' => array47 'auth_sitegroup_mode' => array 48 48 ( 49 49 'title' => 'auth_sitegroup_mode', … … 62 62 ), 63 63 64 'auth_login_form_httpcode' => array64 'auth_login_form_httpcode' => array 65 65 ( 66 66 'title' => 'auth_login_form_httpcode', … … 78 78 ), 79 79 80 'auth_check_client_ip' => array80 'auth_check_client_ip' => array 81 81 ( 82 82 'type' => 'select', … … 87 87 'options' => array 88 88 ( 89 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['auth_check_client_ip'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),90 '1' => 'yes',91 '0' => 'no',92 ), 93 ), 94 ), 95 96 'auth_allow_sudo' => array89 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['auth_check_client_ip'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 90 '1' => 'yes', 91 '0' => 'no', 92 ), 93 ), 94 ), 95 96 'auth_allow_sudo' => array 97 97 ( 98 98 'type' => 'select', … … 103 103 'options' => array 104 104 ( 105 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['auth_allow_sudo'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),106 '1' => 'yes', 107 '0' => 'no', 108 ), 109 ), 110 ), 111 112 'auth_backend_simple_cookie_id' => array105 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['auth_allow_sudo'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 106 '1' => 'yes', 107 '0' => 'no', 108 ), 109 ), 110 ), 111 112 'auth_backend_simple_cookie_id' => array 113 113 ( 114 114 'type' => 'text', … … 118 118 ), 119 119 120 'auth_backend_simple_cookie_path' => array120 'auth_backend_simple_cookie_path' => array 121 121 ( 122 122 'type' => 'text', … … 125 125 ), 126 126 127 'auth_backend_simple_cookie_domain' => array127 'auth_backend_simple_cookie_domain' => array 128 128 ( 129 129 'type' => 'text', … … 133 133 134 134 // Cache configuration 135 'cache_base_directory' => array135 'cache_base_directory' => array 136 136 ( 137 137 'type' => 'text', … … 141 141 142 142 /* 143 'cache_module_content_uncached' => array143 'cache_module_content_uncached' => array 144 144 ( 145 145 'type' => 'select', … … 150 150 'options' => array 151 151 ( 152 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['cache_module_content_uncached'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),152 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['cache_module_content_uncached'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 153 153 '1' => 'yes', 154 154 '0' => 'no', … … 158 158 */ 159 159 160 'cache_module_content_headers_strategy' => array160 'cache_module_content_headers_strategy' => array 161 161 ( 162 162 'type' => 'select', … … 169 169 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['cache_module_content_headers_strategy']), 170 170 'no-cache' =>'cs-no-cache', 171 'revalidate' =>'cs-revalidate',172 'public' =>'cs-public',173 'private'=>'cs-private',171 'revalidate' =>'cs-revalidate', 172 'public' =>'cs-public', 173 'private'=>'cs-private', 174 174 ), 175 175 ), … … 183 183 ), 184 184 185 'i18n_fallback_language' => array185 'i18n_fallback_language' => array 186 186 ( 187 187 'title' => 'i18n_fallback_language', … … 195 195 196 196 // Indexer Configuration 197 'indexer_backend' => array197 'indexer_backend' => array 198 198 ( 199 199 'title' => 'indexer_backend', … … 203 203 'options' => array 204 204 ( 205 ''=> 'indexer_backend_none',205 false => 'indexer_backend_none', 206 206 'xmltcp' => 'indexer_backend_xmltcp', 207 207 'solr' => 'Solr indexer', … … 211 211 ), 212 212 213 'indexer_index_name' => array213 'indexer_index_name' => array 214 214 ( 215 215 'type' => 'text', … … 219 219 220 220 // XMLTCP indexer backend (THE RECOMMENDED ONE) 221 'indexer_xmltcp_host' => array221 'indexer_xmltcp_host' => array 222 222 ( 223 223 'type' => 'text', … … 226 226 ), 227 227 228 'indexer_xmltcp_port' => array228 'indexer_xmltcp_port' => array 229 229 ( 230 230 'type' => 'text', … … 235 235 /* 236 236 // XMLShell indexer backend configuration 237 'indexer_xmlshell_executable' => array237 'indexer_xmlshell_executable' => array 238 238 ( 239 239 'type' => 'text', … … 242 242 ), 243 243 244 'indexer_xmlshell_working_directory' => array244 'indexer_xmlshell_working_directory' => array 245 245 ( 246 246 'type' => 'text', … … 250 250 251 251 // Logging Configuration 252 'log_filename' => array252 'log_filename' => array 253 253 ( 254 254 'type' => 'text', … … 257 257 ), 258 258 259 'log_level' => array259 'log_level' => array 260 260 ( 261 261 'title' => 'log_level', … … 276 276 ), 277 277 278 'log_tailurl_enable' => array278 'log_tailurl_enable' => array 279 279 ( 280 280 'type' => 'select', … … 285 285 'options' => array 286 286 ( 287 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['log_tailurl_enable'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),287 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['log_tailurl_enable'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 288 288 '1' => 'yes', 289 289 '0' => 'no', … … 294 294 // Core configuration 295 295 /* 296 'midcom_ais_url' => array296 'midcom_ais_url' => array 297 297 ( 298 298 'type' => 'text', … … 302 302 */ 303 303 304 'midcom_prefix' => array304 'midcom_prefix' => array 305 305 ( 306 306 'type' => 'text', … … 309 309 ), 310 310 311 'midcom_root_topic_guid' => array311 'midcom_root_topic_guid' => array 312 312 ( 313 313 'title' => 'midcom_root_topic_guid', … … 349 349 ), 350 350 351 'midcom_sgconfig_basedir' => array351 'midcom_sgconfig_basedir' => array 352 352 ( 353 353 'type' => 'text', … … 356 356 ), 357 357 358 'midcom_site_url' => array358 'midcom_site_url' => array 359 359 ( 360 360 'type' => 'text', … … 363 363 ), 364 364 365 'midcom_tempdir' => array365 'midcom_tempdir' => array 366 366 ( 367 367 'type' => 'text', … … 370 370 ), 371 371 372 'midcom_temporary_resource_timeout' => array372 'midcom_temporary_resource_timeout' => array 373 373 ( 374 374 'type' => 'text', … … 378 378 379 379 // Visibility settings (NAP) 380 'show_hidden_objects' => array380 'show_hidden_objects' => array 381 381 ( 382 382 'type' => 'select', … … 387 387 'options' => array 388 388 ( 389 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['show_hidden_objects'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),390 '1' => 'yes', 391 '0' => 'no', 392 ), 393 ), 394 ), 395 396 'show_unapproved_objects' => array389 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['show_hidden_objects'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 390 '1' => 'yes', 391 '0' => 'no', 392 ), 393 ), 394 ), 395 396 'show_unapproved_objects' => array 397 397 ( 398 398 'type' => 'select', … … 403 403 'options' => array 404 404 ( 405 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['show_unapproved_objects'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),405 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['show_unapproved_objects'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 406 406 '1' => 'yes', 407 407 '0' => 'no', … … 410 410 ), 411 411 412 'i18n_multilang_strict' => array412 'i18n_multilang_strict' => array 413 413 ( 414 414 'type' => 'select', … … 419 419 'options' => array 420 420 ( 421 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['i18n_multilang_strict'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),421 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['i18n_multilang_strict'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 422 422 '1' => 'yes', 423 423 '0' => 'no', … … 427 427 428 428 // Utilities 429 'utility_imagemagick_base' => array429 'utility_imagemagick_base' => array 430 430 ( 431 431 'type' => 'text', … … 434 434 ), 435 435 436 'utility_jpegtran' => array436 'utility_jpegtran' => array 437 437 ( 438 438 'type' => 'text', … … 441 441 ), 442 442 443 'utility_unzip' => array443 'utility_unzip' => array 444 444 ( 445 445 'type' => 'text', … … 448 448 ), 449 449 450 'utility_gzip' => array450 'utility_gzip' => array 451 451 ( 452 452 'type' => 'text', … … 455 455 ), 456 456 457 'utility_tar' => array457 'utility_tar' => array 458 458 ( 459 459 'type' => 'text', … … 462 462 ), 463 463 464 'utility_jhead' => array464 'utility_jhead' => array 465 465 ( 466 466 'type' => 'text', … … 469 469 ), 470 470 471 'utility_find' => array471 'utility_find' => array 472 472 ( 473 473 'type' => 'text', … … 476 476 ), 477 477 478 'utility_file' => array478 'utility_file' => array 479 479 ( 480 480 'type' => 'text', … … 483 483 ), 484 484 485 'utility_catdoc' => array485 'utility_catdoc' => array 486 486 ( 487 487 'type' => 'text', … … 490 490 ), 491 491 492 'utility_pdftotext' => array492 'utility_pdftotext' => array 493 493 ( 494 494 'type' => 'text', … … 497 497 ), 498 498 499 'utility_unrtf' => array499 'utility_unrtf' => array 500 500 ( 501 501 'type' => 'text', … … 505 505 506 506 // Revision control service 507 'utility_diff' => array507 'utility_diff' => array 508 508 ( 509 509 'type' => 'text', … … 512 512 ), 513 513 514 'utility_rcs' => array514 'utility_rcs' => array 515 515 ( 516 516 'type' => 'text', … … 519 519 ), 520 520 521 'midcom_services_rcs_bin_dir' => array521 'midcom_services_rcs_bin_dir' => array 522 522 ( 523 523 'type' => 'text', … … 526 526 ), 527 527 528 'midcom_services_rcs_enable' => array528 'midcom_services_rcs_enable' => array 529 529 ( 530 530 'type' => 'select', … … 535 535 'options' => array 536 536 ( 537 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['midcom_services_rcs_enable'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),537 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['midcom_services_rcs_enable'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 538 538 '1' => 'yes', 539 539 '0' => 'no', … … 543 543 544 544 // Metadata system 545 'metadata_approval' => array545 'metadata_approval' => array 546 546 ( 547 547 'type' => 'select', … … 552 552 'options' => array 553 553 ( 554 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['metadata_approval'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),555 '1' => 'yes', 556 '0' => 'no', 557 ), 558 ), 559 ), 560 'metadata_scheduling' => array554 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['metadata_approval'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 555 '1' => 'yes', 556 '0' => 'no', 557 ), 558 ), 559 ), 560 'metadata_scheduling' => array 561 561 ( 562 562 'type' => 'select', … … 567 567 'options' => array 568 568 ( 569 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['metadata_scheduling'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),570 '1' => 'yes', 571 '0' => 'no', 572 ), 573 ), 574 ), 575 'metadata_schema' => array569 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['metadata_scheduling'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 570 '1' => 'yes', 571 '0' => 'no', 572 ), 573 ), 574 ), 575 'metadata_schema' => array 576 576 ( 577 577 'type' => 'text', … … 579 579 'title' => 'metadata_schema', 580 580 ), 581 'staging2live_staging' => array581 'staging2live_staging' => array 582 582 ( 583 583 'type' => 'select', … … 588 588 'options' => array 589 589 ( 590 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['staging2live_staging'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')),590 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['staging2live_staging'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 591 591 '1' => 'yes', 592 592 '0' => 'no', … … 596 596 597 597 // Positioning system 598 'positioning_enable' => array598 'positioning_enable' => array 599 599 ( 600 600 'type' => 'select', … … 605 605 'options' => array 606 606 ( 607 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['positioning_enable'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 608 '1' => 'yes', 609 '0' => 'no', 610 ), 611 ), 612 ), 613 614 607 '' => sprintf($_MIDCOM->i18n->get_string('default (%s)', 'midcom.admin.settings'), $GLOBALS['midcom_config_default']['positioning_enable'] ? $_MIDCOM->i18n->get_string('yes', 'midcom') : $_MIDCOM->i18n->get_string('no', 'midcom')), 608 '1' => 'yes', 609 '0' => 'no', 610 ), 611 ), 612 ), 613 'component_listing_allowed' => array 614 ( 615 'type' => 'select', 616 'widget' => 'select', 617 'title' => $_MIDCOM->i18n->get_string('allowed components (leave empty to allow all)', 'midcom.admin.settings'), 618 'type_config' => array 619 ( 620 'allow_multiple' => true, 621 'options' => midcom_admin_folder_folder_management::list_components('', true), 622 ), 623 ), 624 'component_listing_excluded' => array 625 ( 626 'type' => 'select', 627 'widget' => 'select', 628 'title' => $_MIDCOM->i18n->get_string('excluded components (leave empty to allow all)', 'midcom.admin.settings'), 629 'type_config' => array 630 ( 631 'allow_multiple' => true, 632 'options' => midcom_admin_folder_folder_management::list_components('', true), 633 ), 634 ), 615 635 ), 616 636 ), trunk/midcom/midcom.admin.settings/editor.php
r11645 r11670 68 68 require MIDCOM_ROOT . '/midcom/helper/hostconfig.php'; 69 69 70 $_MIDCOM->load_library('midcom.helper.datamanager2'); 70 $_MIDCOM->load_library('midcom.helper.datamanager2'); 71 $_MIDCOM->load_library('midcom.admin.folder'); 71 72 } 72 73 … … 95 96 function _load_schemadb() 96 97 { 97 foreach ($GLOBALS['midcom_config_local'] as $key => $value)98 {99 $this->_defaults[$key] = $value;100 }101 102 $this->_schemadb = midcom_helper_datamanager2_schema::load_database('file:/midcom/admin/settings/config/schemadb_config.inc');98 foreach ($GLOBALS['midcom_config_local'] as $key => $value) 99 { 100 $this->_defaults[$key] = $value; 101 } 102 103 $this->_schemadb = midcom_helper_datamanager2_schema::load_database('file:/midcom/admin/settings/config/schemadb_config.inc'); 103 104 } 104 105 … … 143 144 144 145 $this->_load_controller(); 145 146 146 147 switch ($this->_controller->process_form()) 147 148 { … … 228 229 { 229 230 if ( array_key_exists($key, $GLOBALS['midcom_config'])) { 231 if ($GLOBALS['midcom_config'][$key] != $val) { 230 232 $hostconfig->set($key, $val); 233 } 231 234 232 235 } else {
