From f7089c9d52bb9dd73ecaf52636a9494c4e8fc61f Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 10 Apr 2014 16:17:25 +0200 Subject: [PATCH 1/3] fixed log --- sai/modules/saimod_sys_log/saimod_sys_log.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index f1956f1..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(mysql_escape_string($filter))); - $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER::QQ(array(mysql_escape_string($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 .= '
  • '.$row['class'].'
  • ';} + $result .= '
  • '.$row['class'].'
  • ';} return $result; } From 02f42678faef45b2505f1aa42920a7851f9d0213 Mon Sep 17 00:00:00 2001 From: rylon Date: Wed, 16 Apr 2014 14:32:51 +0200 Subject: [PATCH 2/3] docu files can have the same name in different categories --- sai/modules/saimod_sys_docu/saimod_sys_docu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 02083f6..f1fecc7 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -22,10 +22,10 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { //$tabs[$cat]['content'] .= \Michelf\Markdown::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))); + '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; From 950cb31205f5ec7a4c4ae612b559e1c67940a937 Mon Sep 17 00:00:00 2001 From: rylon Date: Wed, 23 Apr 2014 18:59:16 +0200 Subject: [PATCH 3/3] use of MarkdownExtra for URLs and Tables --- sai/modules/saimod_sys_docu/saimod_sys_docu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index f1fecc7..8378162 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -19,9 +19,9 @@ 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)), + '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' : ''),