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

[Dirk Haun]

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

Modified Files:
	config.class.php 
Log Message:
Re-enabled help link (for the core config only, for the moment)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** config.class.php	17 Feb 2008 08:54:33 -0000	1.28
--- config.class.php	24 Feb 2008 17:07:08 -0000	1.29
***************
*** 466,470 ****
              foreach ($params as $name => $e) {
                  $fs_contents .=
!                     $this->_UI_get_conf_element($name,
                                                 $e['display_name'],
                                                 $e['type'],
--- 466,470 ----
              foreach ($params as $name => $e) {
                  $fs_contents .=
!                     $this->_UI_get_conf_element($grp, $name,
                                                 $e['display_name'],
                                                 $e['type'],
***************
*** 534,539 ****
      }
  
!     function _UI_get_conf_element($name, $display_name, $type, $val,
!                                           $selectionArray = null , $deletable=0)
      {
          global $LANG_CONFIG;
--- 534,539 ----
      }
  
!     function _UI_get_conf_element($group, $name, $display_name, $type, $val,
!                                   $selectionArray = null , $deletable = 0)
      {
          global $LANG_CONFIG;
***************
*** 562,568 ****
          if ($deletable) {
              $t->set_var('delete', $t->parse('output', 'delete-button'));
!         } elseif (false) { // ??? } elseif ($this->ref == 'Core' ) {
!             $t->set_var('unset_link',
!                         "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
              if (($a = strrchr($name, '[')) !== FALSE) {
                  $o = substr($a, 1, -1);
--- 562,568 ----
          if ($deletable) {
              $t->set_var('delete', $t->parse('output', 'delete-button'));
!         } else {
!             //$t->set_var('unset_link',
!             //            "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
              if (($a = strrchr($name, '[')) !== FALSE) {
                  $o = substr($a, 1, -1);
***************
*** 576,582 ****
                      $baseUrl = 'http://www.geeklog.net';
                  }
!                 $t->set_var('doc_link',
!                             '(<a href="' . $baseUrl . '/docs/config.html#desc_'
!                             . $o . '" target="help">?</a>)');
              }
          }
--- 576,587 ----
                      $baseUrl = 'http://www.geeklog.net';
                  }
!                 if ($group == 'Core') {
!                     $descUrl = $baseUrl . '/docs/config.html#desc_' . $o;
!                     $t->set_var('doc_url', $descUrl);
!                     $t->set_var('doc_link',
!                             '(<a href="' . $descUrl . '" target="help">?</a>)');
!                 } else {
!                     // TBD: link to description of plugin option
!                 }
              }
          }
***************
*** 626,630 ****
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($name . '[' . $valkey . ']',
                                                        $display_name . '[' . $valkey . ']',
                                                        substr($type, 1), $valval, $selectionArray);
--- 631,635 ----
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']',
                                                        $display_name . '[' . $valkey . ']',
                                                        substr($type, 1), $valval, $selectionArray);
***************
*** 640,644 ****
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($name . '[' . $valkey . ']', $valkey,
                                                        substr($type, 1), $valval, $selectionArray, true);
              }
--- 645,649 ----
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']', $valkey,
                                                        substr($type, 1), $valval, $selectionArray, true);
              }