Deprecated parameters removed, oversized SQL statements won't "explode" the design:

- Parameters 'dashed', 'switch' and 'width' removed
- Oversized SQL statements will no longer "explode" the design
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index b4bd19d2311e82e4ec0f29ab2ea8d4c4688fae90..68ce899955a06987311b87724aecd18a2d88d83b 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -40,7 +40,7 @@
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:155:    // @TODO Do we still need this? setExtensionUpdateNotes('');
-./inc/extensions-functions.php:1945:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:1943:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
 ./inc/extensions-functions.php:425:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:562:            // @TODO Extension is loaded, what next?
 ./inc/filter/bonus_filter.php:56:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
@@ -132,7 +132,7 @@
 ./inc/modules/admin/what-list_links.php:55:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:85:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_links.php:93:                                    // @TODO Rewrite this to includes/filter
-./inc/modules/admin/what-list_refs.php:107:                                                            // @TODO Try to rewrite some to EL
+./inc/modules/admin/what-list_refs.php:99:                                                             // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:107:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_unconfirmed.php:84:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
 ./inc/modules/admin/what-list_user.php:247:            // @TODO Rewrite this into a filter
@@ -166,7 +166,7 @@
 ./inc/modules/member/what-transfer.php:128:                            // @TODO Rewrite this to a filter
 ./inc/modules/member/what-unconfirmed.php:162: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/member/what-unconfirmed.php:227:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
-./inc/modules/order.php:74:            // @TODO Unused: 2,4
+./inc/modules/order.php:78:            // @TODO Unused: 2,4
 ./inc/mysql-manager.php:1275:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/mysql-manager.php:1339:          // @TODO Rewrite these lines to a filter
 ./inc/mysql-manager.php:1363:  // @TODO Rewrite this to a filter

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 7f99674ee652d291cfa7f029633168a8992ee43d..bb28fdce30f31841b3c050cd993a4a2b90def8e1 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -764,7 +764,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false, $ignoreDependen
 }
 
 // Output verbose SQL table for extension
-function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}', $dashed = '', $switch = false, $width = '100%') {
+function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}') {
        // Empty title?
        if (empty($title)) {
                // Then abort here
@@ -806,8 +806,6 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
 
                        // Prepare content for template
                        $content = array(
-                               'width'  => $width,
-                               'dashed' => $dashed,
                                'title'  => $title,
                                'rows'   => $OUT
                        );

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 6d755cf221562655309d3b35dd0e941be6791309..f330994e938f64af9423e6ca82844a0c7563b5a8 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -243,7 +243,7 @@ LIMIT 1",
                                        // Add SQLs to a table
                                        if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
                                                // Add verbose SQL table
-                                               $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
+                                               $taskData['text'] .= addExtensionVerboseSqlTable($title);
                                        } // END - if
                                } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
                                        // Run SQL commands in dry mode but only return the notes

diff --git a/templates/de/html/admin/admin_extension_sql_row.tpl b/templates/de/html/admin/admin_extension_sql_row.tpl
index 31205779193725c3d8c7e9d2af0d12d6fbf63b13..e42fecdb522044910d6d2b4da348761c2f203f30 100644 (file)
--- a/templates/de/html/admin/admin_extension_sql_row.tpl
+++ b/templates/de/html/admin/admin_extension_sql_row.tpl
@@ -1,6 +1,8 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom" style="padding-left: 2px" width="30">$content[i].</td>
-       <td class="{%template,ColorSwitch%} bottom" style="padding-left: 5px; padding-right: 5px">
-               $content[sql]
+       <td class="{%template,ColorSwitch%} bottom">
+               <div style="padding-left:5px;padding-right:5px;overflow:auto;width:600px;max-height:150px">
+                       $content[sql]
+               </div>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_extension_sql_table.tpl b/templates/de/html/admin/admin_extension_sql_table.tpl
index 4ee4ad96e93a99b7bd4195bd527e47498c1f8473..d6c0ddc177ab3b6239aeda97fb5afe921c0c1edf 100644 (file)
--- a/templates/de/html/admin/admin_extension_sql_table.tpl
+++ b/templates/de/html/admin/admin_extension_sql_table.tpl
@@ -1,7 +1,7 @@
 <div align="center">
-<table border="0" cellspacing="0" cellpadding="0" width="$content[width]" align="center"$content[dashed]>
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
-       <td colspan="2" align="center" class="table_header bottom" height="24">
+       <td colspan="2" align="center" class="table_header bottom">
                <strong>$content[title]:</strong>
        </td>
 </tr>