From aebafd5a0fceb05860bb74582387db183193e0b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 9 Aug 2011 21:10:55 +0000 Subject: [PATCH] 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 --- DOCS/TODOs.txt | 6 +++--- inc/extensions-functions.php | 4 +--- inc/modules/admin/overview-inc.php | 2 +- templates/de/html/admin/admin_extension_sql_row.tpl | 6 ++++-- templates/de/html/admin/admin_extension_sql_table.tpl | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index b4bd19d231..68ce899955 100644 --- 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 7f99674ee6..bb28fdce30 100644 --- 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 6d755cf221..f330994e93 100644 --- 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 3120577919..e42fecdb52 100644 --- a/templates/de/html/admin/admin_extension_sql_row.tpl +++ b/templates/de/html/admin/admin_extension_sql_row.tpl @@ -1,6 +1,8 @@ $content[i]. - - $content[sql] + +
+ $content[sql] +
diff --git a/templates/de/html/admin/admin_extension_sql_table.tpl b/templates/de/html/admin/admin_extension_sql_table.tpl index 4ee4ad96e9..d6c0ddc177 100644 --- a/templates/de/html/admin/admin_extension_sql_table.tpl +++ b/templates/de/html/admin/admin_extension_sql_table.tpl @@ -1,7 +1,7 @@
- +
- -- 2.30.2
+ $content[title]: