[geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.33, 1.34

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv52470/system/classes

Modified Files:
	config.class.php 
Log Message:
Be more fault tolerant against missing texts, e.g. in translations


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** config.class.php	21 Mar 2008 15:38:05 -0000	1.33
--- config.class.php	21 Mar 2008 19:43:32 -0000	1.34
***************
*** 337,341 ****
                        'selectionArray' =>
                        (($cur[2] != -1) ?
!                        $LANG_configselects[$group][$cur[2]] : null),
                        'value' =>
                        (($cur[4] == 'unset') ?
--- 337,341 ----
                        'selectionArray' =>
                        (($cur[2] != -1) ?
!                        isset($LANG_configselects[$group][$cur[2]]) : null),
                        'value' =>
                        (($cur[4] == 'unset') ?
***************
*** 346,350 ****
      }
  
!     /* Changes any config settings that depend on other configuration settings. */
      function _post_configuration()
      {
--- 346,350 ----
      }
  
!     // Changes any config settings that depend on other configuration settings.
      function _post_configuration()
      {
***************
*** 433,439 ****
                              $t->set_var('subgroup_active_name',
                                      $LANG_configsubgroups[$group][$sgname]);
!                         } else {
                              $t->set_var('subgroup_active_name',
                                      $LANG_configsubgroups[$group][$sgroup]);
                          }
                          $t->set_var('select_id', 'id="current"');
--- 433,441 ----
                              $t->set_var('subgroup_active_name',
                                      $LANG_configsubgroups[$group][$sgname]);
!                         } else if (isset($LANG_configsubgroups[$group][$sgroup])) {
                              $t->set_var('subgroup_active_name',
                                      $LANG_configsubgroups[$group][$sgroup]);
+                         } else {
+                             $t->set_var('subgroup_active_name', $sgname);
                          }
                          $t->set_var('select_id', 'id="current"');
***************
*** 442,447 ****
                      }
                      $t->set_var('subgroup_name', $sgroup);
!                     $t->set_var("subgroup_display_name",
!                                 $LANG_configsubgroups[$group][$sgname]);
                      if ($innerloopcntr == 1) {
                          $t->parse('subgroups', "subgroup-selector");
--- 444,453 ----
                      }
                      $t->set_var('subgroup_name', $sgroup);
!                     if (isset($LANG_configsubgroups[$group][$sgname])) {
!                         $t->set_var('subgroup_display_name',
!                                     $LANG_configsubgroups[$group][$sgname]);
!                     } else {
!                         $t->set_var('subgroup_display_name', $sgname);
!                     }
                      if ($innerloopcntr == 1) {
                          $t->parse('subgroups', "subgroup-selector");
***************
*** 514,519 ****
          if (empty($fs_index)) {
              $t->set_var('fs_display', $LANG_fs[$group][$fs_id]);
!         } else {
              $t->set_var('fs_display', $LANG_fs[$group][$fs_index]);
          }
          $t->set_var('fs_notes', '');
--- 520,527 ----
          if (empty($fs_index)) {
              $t->set_var('fs_display', $LANG_fs[$group][$fs_id]);
!         } else if (isset($LANG_fs[$group][$fs_index])) {
              $t->set_var('fs_display', $LANG_fs[$group][$fs_index]);
+         } else {
+             $t->set_var('fs_display', $fs_index);
          }
          $t->set_var('fs_notes', '');
***************
*** 761,766 ****
                  if (isset($LANG_configsubgroups[$conf_group][$sgname])) {
                      $group_display = $LANG_configsubgroups[$conf_group][$sgname];
!                 } else {
                      $group_display = $LANG_configsubgroups[$conf_group][$sgroup];
                  }
                  // Create a menu item for each sub config group - disable the link for the current selected one
--- 769,776 ----
                  if (isset($LANG_configsubgroups[$conf_group][$sgname])) {
                      $group_display = $LANG_configsubgroups[$conf_group][$sgname];
!                 } else if (isset($LANG_configsubgroups[$conf_group][$sgroup])) {
                      $group_display = $LANG_configsubgroups[$conf_group][$sgroup];
+                 } else {
+                     $group_display = $sgname;
                  }
                  // Create a menu item for each sub config group - disable the link for the current selected one