diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 02083f6..8378162 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -19,13 +19,13 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { $tabs[$cat]['tab_id'] = str_replace(' ', '_', $cat); $tabs[$cat]['content'] = isset($tabs[$cat]['content']) ? $tabs[$cat]['content'] : ''; $tabs[$cat]['menu'] = isset($tabs[$cat]['menu']) ? $tabs[$cat]['menu'] : ''; - //$tabs[$cat]['content'] .= \Michelf\Markdown::defaultTransform(file_get_contents($doc)); + //$tabs[$cat]['content'] .= \Michelf\MarkdownExtra::defaultTransform(file_get_contents($doc)); $vars3 = array( 'active' => ($first2 ? 'active' : ''), - 'content' => \Michelf\Markdown::defaultTransform(file_get_contents($doc)), - 'tab_id' => str_replace(array('.',' '), '_', basename($doc))); + 'content' => \Michelf\MarkdownExtra::defaultTransform(file_get_contents($doc)), + 'tab_id' => str_replace(array('.',' ','\\','/'), '_', $doc)); $tabs[$cat]['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tab2.tpl'), $vars3); $vars3 = array( 'active' => ($first2 ? 'active' : ''), - 'tab_id' => str_replace(array('.',' '), '_', basename($doc)), + 'tab_id' => str_replace(array('.',' ','\\','/'), '_', $doc), 'tab_id_pretty' => basename($doc)); $tabs[$cat]['menu'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tabopt.tpl'), $vars3); $first2 = false; diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 3a3af77..c3fd995 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -61,8 +61,8 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_error.tpl'), $vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = "%"){ - $count = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER_COUNT::Q1(array($filter)); - $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER::QQ(array($filter)); + $count = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER_COUNT::Q1(array($filter)); + $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER::QQ(array($filter)); $table=''; while($r = $res->next()){ //print_r($r); @@ -108,7 +108,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTERS::QQ(); $result = ''; while($row = $res->next()){ - $result .= '