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

[Dirk Haun]

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

Modified Files:
	config.class.php 
Log Message:
Removed 'fn:' config type again; looks for specific functions now for dynamic array contents


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** config.class.php	15 Mar 2008 19:55:20 -0000	1.32
--- config.class.php	21 Mar 2008 15:38:05 -0000	1.33
***************
*** 596,623 ****
          } elseif ($type == "placeholder") {
              return $t->finish($t->parse('output', 'placeholder-element'));
!         } elseif ($type == "select") {
!             if (! is_array($selectionArray)) {
!                 return $t->finish($t->parse('output', 'text-element'));
              }
! 
!             $t->set_block('select-element', 'select-options', 'myoptions');
!             uksort($selectionArray, 'strcasecmp');
!             foreach ($selectionArray as $sName => $sVal) {
!                 if (is_bool($sVal)) {
!                     $t->set_var('opt_value', $sVal ? 'b:1' : 'b:0');
!                 } else {
!                     $t->set_var('opt_value', $sVal);
!                 }
!                 $t->set_var('opt_name', $sName);
!                 $t->set_var('selected', ($val == $sVal ? 'selected="selected"' : ''));
!                 $t->parse('myoptions', 'select-options', true);
              }
!             return $t->parse('output', 'select-element');
!         } elseif (substr($type, 0, 3) == 'fn:') {
!             $fn = 'configmanager_' . substr($type, 3);
!             if (!function_exists($fn)) {
                  return $t->finish($t->parse('output', 'text-element'));
              }
!             $selectionArray = $fn();
              $t->set_block('select-element', 'select-options', 'myoptions');
              foreach ($selectionArray as $sName => $sVal) {
--- 596,616 ----
          } elseif ($type == "placeholder") {
              return $t->finish($t->parse('output', 'placeholder-element'));
!         } elseif ($type == 'select') {
!             $type_name = $type . '_' . $name;
!             if ($group == 'Core') {
!                 $fn = 'configmanager_' . $type_name . '_helper';
!             } else {
!                 $fn = 'plugin_configmanager_' . $type_name . '_' . $group;
              }
!             if (function_exists($fn)) {
!                 $selectionArray = $fn();
!             } else if (is_array($selectionArray)) {
!                 // leave sorting to the function otherwise
!                 uksort($selectionArray, 'strcasecmp');
              }
!             if (! is_array($selectionArray)) {
                  return $t->finish($t->parse('output', 'text-element'));
              }
! 
              $t->set_block('select-element', 'select-options', 'myoptions');
              foreach ($selectionArray as $sName => $sVal) {
***************
*** 635,641 ****
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']',
!                                                       $display_name . '[' . $valkey . ']',
!                                                       substr($type, 1), $valval, $selectionArray);
              }
              return $result;
--- 628,635 ----
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group,
!                                 $name . '[' . $valkey . ']',
!                                 $display_name . '[' . $valkey . ']',
!                                 substr($type, 1), $valval, $selectionArray);
              }
              return $result;
***************
*** 649,654 ****
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']', $valkey,
!                                                       substr($type, 1), $valval, $selectionArray, true);
              }
              $t->set_var('my_elements', $result);
--- 643,650 ----
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group,
!                                 $name . '[' . $valkey . ']', $valkey,
!                                 substr($type, 1), $valval, $selectionArray,
!                                 true);
              }
              $t->set_var('my_elements', $result);