From 6cb1f4ea02231f65ea9cb79201134b5158eb4e5b Mon Sep 17 00:00:00 2001 From: Malte Date: Wed, 24 Jun 2015 18:22:13 +0200 Subject: [PATCH 1/3] added delete call for system_page group 42 --- dbd/sql/mysql/data/system_page.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql index a45e84a..0aa9416 100644 --- a/dbd/sql/mysql/data/system_page.sql +++ b/dbd/sql/mysql/data/system_page.sql @@ -1,3 +1,5 @@ +DELETE FROM system_page WHERE `group` = 42; + INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (0, 42, 'start', 'start', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saistart_sys_sai', 'init_saistart_sys_sai', '\\SYSTEM\\SAI\\saistart_sys_sai'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (1, 42, 'todo', 'start', 0, 1, 0, '#todo_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_todo&action=todolist', 'init_saistart_sys_sai_todo', '\\SYSTEM\\SAI\\saistart_sys_sai'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (2, 42, 'log', 'start', 0, 1, 0, '#log_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=filter', 'init_saistart_sys_sai_log', '\\SYSTEM\\SAI\\saistart_sys_sai'); From d512d28475fb9fe275bff602b7a2dead3a4116ad Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 25 Jun 2015 01:50:48 +0200 Subject: [PATCH 2/3] fixed several small bugs (saistart, todo,sql txt) --- dbd/sql/mysql/data/system_text.sql | 2 ++ sai/modules/saimod_sys_todo/saimod_sys_todo.php | 4 ++-- sai/modules/saimod_sys_todo/todo_stats_data.php | 2 +- sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dbd/sql/mysql/data/system_text.sql b/dbd/sql/mysql/data/system_text.sql index 88c5924..68ec6ba 100644 --- a/dbd/sql/mysql/data/system_text.sql +++ b/dbd/sql/mysql/data/system_text.sql @@ -258,6 +258,7 @@ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'jaJA', '丸秘のパスワード', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'basic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'sai_login'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'sai_start'); DELETE FROM `system_text` WHERE id = 'basic_placeholder_username'; DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_username'; @@ -269,6 +270,7 @@ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'trTR', 'peter@world.org', 0, 0, '2015-04-15 18:29:17', '0000-00-00 00:00:00'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'basic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'sai_login'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'sai_start'); DELETE FROM `system_text` WHERE id = 'basic_placeholder_search'; DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_search'; diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php index 0f5b91e..a2bb953 100644 --- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php +++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php @@ -143,7 +143,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $result['project_closed'] += $data->closed; $result['project_all'] += $data->all; } - $result['project'] = round($result['project'] / (count($result['data'])),2); + $result['project'] = sprintf("%.2f",$result['project'] / (count($result['data'])),2); return $result; } @@ -157,7 +157,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $vars['userstats'] = ''; $userstats = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_USERS::QQ(); while($stat = $userstats->next()){ - $stat['perc'] = round(($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']))*100,2); + $stat['perc'] = sprintf("%.2f",($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']))*100); $vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat); } return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats.tpl'), $vars); diff --git a/sai/modules/saimod_sys_todo/todo_stats_data.php b/sai/modules/saimod_sys_todo/todo_stats_data.php index c85d3a8..cc4747a 100644 --- a/sai/modules/saimod_sys_todo/todo_stats_data.php +++ b/sai/modules/saimod_sys_todo/todo_stats_data.php @@ -11,6 +11,6 @@ class todo_stats_data { $this->open = $all-$closed; $this->closed = $closed; $this->all = $all; - $this->perc = round($this->closed / ($this->all == 0 ? 1 : $this->all) * 100,2); + $this->perc = $this->all == 0 ? 1 : sprintf("%.2f", $this->closed / $this->all * 100); } } diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl index 6c535a8..231edbe 100644 --- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl @@ -56,7 +56,6 @@ -

From a6b7f7e7885d9d7e8983b6c6e99ca4acbb70458a Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 25 Jun 2015 02:36:58 +0200 Subject: [PATCH 3/3] fixed html error --- sai/modules/saimod_sys_login/tpl/login.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sai/modules/saimod_sys_login/tpl/login.tpl b/sai/modules/saimod_sys_login/tpl/login.tpl index a31a806..b4bd837 100644 --- a/sai/modules/saimod_sys_login/tpl/login.tpl +++ b/sai/modules/saimod_sys_login/tpl/login.tpl @@ -29,5 +29,5 @@
-${basic_text_register}
+${basic_text_register}
${basic_text_password_miss} \ No newline at end of file