[Betterawstats-cvs] betterawstats/modules render_htmlchart.inc.php, 1.42, 1.43 render_map.inc.php,
Brought to you by:
tokyoahead
From: Oliver S. <tok...@us...> - 2008-04-25 08:30:11
|
Update of /cvsroot/betterawstats/betterawstats/modules In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18056/modules Modified Files: render_htmlchart.inc.php render_map.inc.php render_table.inc.php Log Message: var. fixes regarding config editor, one-site setting Index: render_table.inc.php =================================================================== RCS file: /cvsroot/betterawstats/betterawstats/modules/render_table.inc.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** render_table.inc.php 25 Apr 2008 05:30:05 -0000 1.64 --- render_table.inc.php 25 Apr 2008 08:30:04 -0000 1.65 *************** *** 43,46 **** --- 43,48 ---- return $data_set; } + global $BAW_MES, $BAW_CONF_DIS_TYP; + $BAW_CONF_DIS_TYP['table'] = array($BAW_MES['cfg_type_table'], 'bool'); // this function does std. processing that this needed in 2 places *************** *** 63,67 **** } ! function baw_module_table($table, $settings, $format, $data_format = false) { global $BAW_CONF, $BAW_LIB, $BAW_MES, $BAW_CONF_DIS; $section_name = $settings['name']; --- 65,69 ---- } ! function baw_module_table($table, $settings, $format, $dataformat = false) { global $BAW_CONF, $BAW_LIB, $BAW_MES, $BAW_CONF_DIS; $section_name = $settings['name']; *************** *** 220,224 **** $table = baw_sql('select', $sql . " LIMIT " . $top_x ); } ! foreach ($table as $lineid => $row) { $cell_no = 0; --- 222,226 ---- $table = baw_sql('select', $sql . " LIMIT " . $top_x ); } ! $lines = 0; foreach ($table as $lineid => $row) { $cell_no = 0; *************** *** 230,233 **** --- 232,237 ---- } else if ($lineid === 'layout_others' || $lineid === 'layout_avg' || $lineid === 'layout_sum') { $class = " class=\"$lineid\""; + } else { + $class = " class=\"". baw_even($lines, 'evenline', 'oddline') . "\""; } $out .= " <tr$class>\n"; *************** *** 290,293 **** --- 294,298 ---- $lastlineid = $lineid; $out .= " </tr>\n"; + $lines++; } $out .= "</table>\n"; Index: render_htmlchart.inc.php =================================================================== RCS file: /cvsroot/betterawstats/betterawstats/modules/render_htmlchart.inc.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** render_htmlchart.inc.php 25 Apr 2008 05:30:05 -0000 1.42 --- render_htmlchart.inc.php 25 Apr 2008 08:30:04 -0000 1.43 *************** *** 32,37 **** die ('This file can not be used on its own!'); } ! function baw_module_htmlchart($chart, $settings, $format, $data_format = false) { baw_debug("rendering chart"); global $BAW_CONF, $BAW_LIB, $BAW_MES; --- 32,39 ---- die ('This file can not be used on its own!'); } + global $BAW_MES, $BAW_CONF_DIS_TYP; + $BAW_CONF_DIS_TYP['htmlchart'] = array($BAW_MES['cfg_type_chart'], 'bool'); ! function baw_module_htmlchart($chart, $settings, $format, $dataformat = false) { baw_debug("rendering chart"); global $BAW_CONF, $BAW_LIB, $BAW_MES; Index: render_map.inc.php =================================================================== RCS file: /cvsroot/betterawstats/betterawstats/modules/render_map.inc.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** render_map.inc.php 25 Apr 2008 05:30:05 -0000 1.25 --- render_map.inc.php 25 Apr 2008 08:30:04 -0000 1.26 *************** *** 34,37 **** --- 34,40 ---- } + global $BAW_MES, $BAW_CONF_DIS_TYP; + $BAW_CONF_DIS_TYP['map'] = array($BAW_MES['cfg_type_map'], 'bool'); + function baw_module_map($data, $settings, $format, $data_format = false) { global $BAW_CONF; |