From cc6c21df12932bc3c422499f07bd7a7b5047f172 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Wed, 15 Apr 2015 19:45:52 +0200
Subject: [PATCH] removed old qqs, saimod text show only one text per id, show
 count of text next to tag menu entry

---
 .../saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ADD.php     | 12 ------------
 .../qq/SYS_SAIMOD_LOCALE_CATEGORY.php                | 11 -----------
 .../saimod_sys_text/qq/SYS_SAIMOD_LOCALE_DEL.php     | 11 -----------
 .../saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ID.php      | 11 -----------
 .../saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT.php  | 11 -----------
 .../qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php             | 11 -----------
 .../saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php  |  3 ++-
 .../qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php              |  3 ++-
 ...IMOD_LOCALE_TAGS.php => SYS_SAIMOD_TEXT_TAGS.php} |  2 +-
 sai/modules/saimod_sys_text/saimod_sys_text.php      |  2 +-
 sai/modules/saimod_sys_text/tpl/tabopt.tpl           |  2 +-
 11 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ADD.php
 delete mode 100644 sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_CATEGORY.php
 delete mode 100644 sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_DEL.php
 delete mode 100644 sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ID.php
 delete mode 100644 sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT.php
 delete mode 100644 sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php
 rename sai/modules/saimod_sys_text/qq/{SYS_SAIMOD_LOCALE_TAGS.php => SYS_SAIMOD_TEXT_TAGS.php} (86%)

diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ADD.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ADD.php
deleted file mode 100644
index c9fbb3a..0000000
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ADD.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_TEXT_SAVE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'INSERT INTO '.\SYSTEM\DBD\system_locale_string::NAME_PG.' (id, category) VALUES ($1, $2);',
-//mys
-'INSERT INTO '.\SYSTEM\DBD\system_text::NAME_MYS.' (`id`, `language`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES (?,?,?,?,?,?,?) ON DUPLICATE ;'
-
-);}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_CATEGORY.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_CATEGORY.php
deleted file mode 100644
index 1b77836..0000000
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_CATEGORY.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_LOCALE_CATEGORY extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT "category", COUNT(*) as "count" FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' GROUP BY "category" ORDER BY "category" ASC;',
-//mys
-'SELECT `category`, COUNT(*) as `count` FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' GROUP BY `category` ORDER BY `category` ASC;'
-);}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_DEL.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_DEL.php
deleted file mode 100644
index af5070d..0000000
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_DEL.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_LOCALE_DEL extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE id=$1;',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE id=?;'
-);}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ID.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ID.php
deleted file mode 100644
index 61a0101..0000000
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_ID.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_LOCALE_ID extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE id = $1 ORDER BY "category" ASC;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE id = ? ORDER BY "category" ASC;'
-);}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT.php
deleted file mode 100644
index 1a6b082..0000000
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_LOCALE_SELECT extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' ORDER BY "category" ASC;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' ORDER BY category ASC;'
-);}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php
deleted file mode 100644
index cb3bfe8..0000000
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_LOCALE_SELECT_LANG extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT id, category, ? FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' ORDER BY "category" ASC;',
-//mys
-'SELECT id, category, ? FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' ORDER BY category ASC;'
-);}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php
index 06faaa1..f888347 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php
@@ -12,5 +12,6 @@ class SYS_SAIMOD_TEXT_GETTEXTS extends \SYSTEM\DB\QP {
                 LEFT JOIN system_text ON system_text_tag.id = system_text.id
                 LEFT JOIN system_user as a ON system_text.author = a.id
                 LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
-                WHERE tag = ?;'
+                WHERE tag = ?
+                GROUP BY id;'
 );}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php
index 2c409be..934fc8a 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php
@@ -11,5 +11,6 @@ class SYS_SAIMOD_TEXT_GETTEXTS_ALL extends \SYSTEM\DB\QQ {
                 FROM system_text_tag 
                 LEFT JOIN system_text ON system_text_tag.id = system_text.id
                 LEFT JOIN system_user as a ON system_text.author = a.id
-                LEFT JOIN system_user as ae ON system_text.author_edit = ae.id;'
+                LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
+                GROUP BY id;'
 );}}
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_TAGS.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php
similarity index 86%
rename from sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_TAGS.php
rename to sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php
index ad5f03a..0d3941a 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_LOCALE_TAGS.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php
@@ -1,7 +1,7 @@
 <?php
 namespace SYSTEM\DBD;
 
-class SYS_SAIMOD_LOCALE_TAGS extends \SYSTEM\DB\QQ {
+class SYS_SAIMOD_TEXT_TAGS extends \SYSTEM\DB\QQ {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
diff --git a/sai/modules/saimod_sys_text/saimod_sys_text.php b/sai/modules/saimod_sys_text/saimod_sys_text.php
index ddb8236..c4b33b8 100644
--- a/sai/modules/saimod_sys_text/saimod_sys_text.php
+++ b/sai/modules/saimod_sys_text/saimod_sys_text.php
@@ -4,7 +4,7 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
     public static function sai_mod__SYSTEM_SAI_saimod_sys_text(){        
         $vars = array();
         $vars['tabopts'] = '';
-        $res = \SYSTEM\DBD\SYS_SAIMOD_LOCALE_TAGS::QQ();
+        $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TAGS::QQ();
         while($r = $res->next()){
             $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/tabopt.tpl'), $r);}           
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text.tpl'), $vars);
diff --git a/sai/modules/saimod_sys_text/tpl/tabopt.tpl b/sai/modules/saimod_sys_text/tpl/tabopt.tpl
index 8a6cc93..b283af1 100644
--- a/sai/modules/saimod_sys_text/tpl/tabopt.tpl
+++ b/sai/modules/saimod_sys_text/tpl/tabopt.tpl
@@ -1 +1 @@
-<li><a href="#!text;tag.${tag}" id="menu_tag_${tag}">${tag}</a></li>
\ No newline at end of file
+<li><a href="#!text;tag.${tag}" id="menu_tag_${tag}">${tag}(${count})</a></li>
\ No newline at end of file