Some HTML fixes, ext-sql_patches downgraded (!):

- Extension ext-sql_patches is now downgraded to 0.9.4 as update 0.9.5 has
  been moved into 0.9.4
- Fixed some HTML errors
- Added missing legend tag (MEMBER_SURFBAR_EDIT_URL_LEGEND)
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 4b57be8a7ce3c8583a0ede504b0dea191cae8913..ec42d004cf3c019bd67acbdfccf03ee30aee4a91 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -332,14 +332,10 @@ PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_list_user_subid_row.tpl, line: 3 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_delete_user_subids_row.tpl, line: 4 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_edit_user_subids_row.tpl, line: 4 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 8 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 9 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): End tag : expected '>' in templates/de/html/admin/admin_list_user_subid_stats.tpl, line: 32 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in 

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index c548359f714fd6cb155e4653a003b5c8f81f6563..5c166599899805cf6c7facab5819df5fb68454c5 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.9.5');
+setThisExtensionVersion('0.9.4');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
@@ -978,16 +978,10 @@ PRIMARY KEY (`server_name_id`)
 
                        case '0.9.4': // SQL queries for v0.9.4
                                addAdminMenuSql('setup', 'list_referral_levels', 'Referral-Ebenen', 'Erlaubt das Auflisten, hinzufügen, ändern und löschen von Referral-Ebenen. Seien Sie beim Löschen vorsichtig, da deren Id-Nummern zum Verknüpfen verwendet werden. Sollten Sie also eine Ebene löschen, in der Mitglieder {OPEN_CONFIG}POINTS{CLOSE_CONFIG} haben sollten, sind diese verloren.', 15);
-
-                               // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Auflisten (usw.) von Referral-Ebenen ausgelagert in eigenen Menüpunkt.");
-                               break;
-
-                       case '0.9.5': // SQL queries for v0.9.5
                                addExtensionChangeTableColumnSql('refdepths', 'percents', 'percents', 'FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000');
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Referral-Prozente dürfen nun auch 5 Stellen hinter dem Komma haben.");
+                               setExtensionUpdateNotes("Auflisten (usw.) von Referral-Ebenen ausgelagert in eigenen Menüpunkt. Referral-Prozente dürfen nun auch 5 Stellen hinter dem Komma haben.");
                                break;
                } // END - switch
                break;

diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index c1298e250600139717c1d9aadf883cdfc979b7aa..13bc86fd3411a84c5e48c3ad82397782a1948ee7 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -200,7 +200,8 @@ addMessages(array(
        'MEMBER_SURFBAR_DELETE_URL_NOTICE' => "<strong>Hinweis:</strong> Irrt&uuml;mlich gel&ouml;schte URLs k&ouml;nnen nur durch unsere Administratoren wiederhergestellt werden.",
 
        // Member - legends
-       'MEMBER_BOOK_SURFBAR_URL_DATA_LEGEND' => "Geben Sie die Daten zu Ihrer URL ein:",
+       'MEMBER_BOOK_SURFBAR_URL_DATA_LEGEND' => "Geben Sie die Daten zu Ihrer URL ein",
+       'MEMBER_SURFBAR_EDIT_URL_LEGEND' => "&Auml;ndern der URL-Daten",
 
        // Subject lines for admins
        'ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT' => "[Besuchertausch:] URL hinzugef&uuml;gt durch Admin",

diff --git a/inc/language/user_de.php b/inc/language/user_de.php
index 1b70bd183c94fec911450d69f754c55e23bd30ea..c16ad056452bbc16e27310f51daa699e4705f153 100644 (file)
--- a/inc/language/user_de.php
+++ b/inc/language/user_de.php
@@ -192,7 +192,7 @@ addMessages(array(
 
        // Admin - config subids
        'ADMIN_CONFIG_USER_SUBID_TITLE' => "Einstellungen zu Sub-Id-Tracking",
-       'ADMIN_CONFIG_USER_SUBID_AUTOPURGE_LEGEND' => "Bereinigung des Sub-Id-Logbuchs:",
+       'ADMIN_CONFIG_USER_SUBID_AUTOPURGE_LEGEND' => "Bereinigung des Sub-Id-Logbuchs",
        'ADMIN_CONFIG_USER_SUBID_STUFF_AUTOPURGE' => "Soll das Logbuch für Sub-Id-Tracking bereinigt werden?",
        'ADMIN_CONFIG_USER_SUBID_STUFF_AUTOPURGE_SINCE' => "Wie lange sollen alte Logbucheinträge bestehen bleiben?",
 

diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl
index f533137a671dabbfa1e5c0ea5fd8cbcf36a523d1..1bd75e77247e27d7d44fd75581a67982b724839d 100644 (file)
--- a/templates/de/html/admin/admin_admins_mails_list.tpl
+++ b/templates/de/html/admin/admin_admins_mails_list.tpl
@@ -7,7 +7,7 @@
                </td>
        </tr>
        <tr>
-               <td width="30" class="header_column bottom right" align="center" width="30">
+               <td width="30" class="header_column bottom right" align="center">
                        <strong>{--ID_SELECT--}</strong>
                </td>
                <td width="235" class="header_column bottom right" align="center">

diff --git a/templates/de/html/admin/admin_delete_user_subids_row.tpl b/templates/de/html/admin/admin_delete_user_subids_row.tpl
index 0aa903c5644ccfee12f4b3692fadbbbda25e7a59..d9fa7ee6a60262f2e3a3bbc0226253ed2e7edb40 100644 (file)
--- a/templates/de/html/admin/admin_delete_user_subids_row.tpl
+++ b/templates/de/html/admin/admin_delete_user_subids_row.tpl
@@ -1,7 +1,7 @@
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                <strong>$content[id]</strong>
-               <input type="hidden" name="id[$content[id]]" value="1" /></strong>
+               <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                <legend for="subid[$content[id]]">{--SUBID_VALUE--}</legend>

diff --git a/templates/de/html/admin/admin_edit_user_subids_row.tpl b/templates/de/html/admin/admin_edit_user_subids_row.tpl
index fa72be22070e345ba74a037824536b3c64bb284f..0c59f7088ca8f670758d6e7a2d64b091d8ffa0e8 100644 (file)
--- a/templates/de/html/admin/admin_edit_user_subids_row.tpl
+++ b/templates/de/html/admin/admin_edit_user_subids_row.tpl
@@ -1,7 +1,7 @@
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                <strong>$content[id]</strong>
-               <input type="hidden" name="id[$content[id]]" value="1" /></strong>
+               <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                <legend for="subid[$content[id]]">{--ADMIN_CHANGE_USER_SUBID--}</legend>

diff --git a/templates/de/html/admin/admin_list_user_subid_row.tpl b/templates/de/html/admin/admin_list_user_subid_row.tpl
index 234d91b0e22d95f8e54ef4f43c9aee943b269d88..0526d5ceb7663d9dfbe36649ab3da7f91341caf7 100644 (file)
--- a/templates/de/html/admin/admin_list_user_subid_row.tpl
+++ b/templates/de/html/admin/admin_list_user_subid_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <input type="checkbox" class="form_field" name="id[$content[id]]" value="1" /></strong>
+               <input type="checkbox" class="form_field" name="id[$content[id]]" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                {%pipe,generateUserProfileLink=$content[userid]%}

diff --git a/templates/de/html/admin/admin_list_user_subid_stats.tpl b/templates/de/html/admin/admin_list_user_subid_stats.tpl
index 975f86e853b7261c780384929c0de9563526bb33..e306697e5dac91a4d6e11d3ffff0bf94fac7122a 100644 (file)
--- a/templates/de/html/admin/admin_list_user_subid_stats.tpl
+++ b/templates/de/html/admin/admin_list_user_subid_stats.tpl
@@ -1,31 +1,34 @@
 <div align="center">
 {%form,formMethodPost=modules.php?module=admin&amp;what=list_user_subid&amp;do=stats&amp;userid=$content[userid]&amp;id=$content[id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="6" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_LIST_USER_SUBID_STATS_TITLE--}</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--SUBID_VALUE--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--REFERRER_URL--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--REMOTE_IP--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--USER_AGENT--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--ENTRY_ADDED--}</strong></td>
-       </tr>
-       $content[rows]
-       <tr>
-               <td colspan="6" class="table_footer">
-                       <input type="hidden" name="subid[0]" value="{%get,getSubId=id%}" />
-                       <input type="hidden" name="refid" value="{%get,bigintval=userid%}" />
-                       <input type="submit" class="form_delete" name="do_delete_stats" value="{--ADMIN_DELETE_USER_SUBID_STATS_SUBMIT--}" />
-               </td>
-       </tr>
+<tr>
+       <td colspan="6" align="center" class="table_header bottom">
+               <strong>{--ADMIN_LIST_USER_SUBID_STATS_TITLE--}</strong>
+       </td>
+</tr>
+
+<tr>
+       <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--SUBID_VALUE--}</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--REFERRER_URL--}</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--REMOTE_IP--}</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--USER_AGENT--}</strong></td>
+       <td align="center" class="header_column bottom"><strong>{--ENTRY_ADDED--}</strong></td>
+</tr>
+
+$content[rows]
+
+<tr>
+       <td colspan="6" class="table_footer">
+               <input type="hidden" name="subid[0]" value="{%get,getSubId=id%}" />
+               <input type="hidden" name="refid" value="{%get,bigintval=userid%}" />
+               <input type="submit" class="form_delete" name="do_delete_stats" value="{--ADMIN_DELETE_USER_SUBID_STATS_SUBMIT--}" />
+       </td>
+</tr>
 </table>
 {%form_close%}
 </div>
 
 <div class="notice">
        {--ADMIN_USER_SUBID_STATS_NOTICE--}
-</div
+</div>

diff --git a/templates/de/html/member/member_book_surfbar_dynamic.tpl b/templates/de/html/member/member_book_surfbar_dynamic.tpl
index 859b1e786a948b8782c374427d880c3456a88335..081b7c2e7c512f6db20205efb174ff36ada34345 100644 (file)
--- a/templates/de/html/member/member_book_surfbar_dynamic.tpl
+++ b/templates/de/html/member/member_book_surfbar_dynamic.tpl
@@ -25,7 +25,7 @@
                </div>
 
                <div class="member_input" style="padding-top:5px;padding-bottom:5px" align="center">
-                       <label class="member_label" for="package">{--MEMBER_SURFBAR_URL_SELECT_PACKAGE--}</legend>
+                       <label class="member_label" for="package">{--MEMBER_SURFBAR_URL_SELECT_PACKAGE--}</label>
                        {%pipe,generateMemberSurfbarPackageSelectionBox%}
                </div>
        </fieldset>

diff --git a/templates/de/html/member/member_book_surfbar_static.tpl b/templates/de/html/member/member_book_surfbar_static.tpl
index 951939d00a28c65d26ecb681cf882708653ee46e..b2c67e14da379d02c637aa8540ee50f0321eb70d 100644 (file)
--- a/templates/de/html/member/member_book_surfbar_static.tpl
+++ b/templates/de/html/member/member_book_surfbar_static.tpl
@@ -25,7 +25,7 @@
                </div>
 
                <div class="member_input" style="padding-top:5px;padding-bottom:5px" align="center">
-                       <label class="member_label" for="package">{--MEMBER_SURFBAR_URL_SELECT_PACKAGE--}</legend>
+                       <label class="member_label" for="package">{--MEMBER_SURFBAR_URL_SELECT_PACKAGE--}</label>
                        {%pipe,generateMemberSurfbarPackageSelectionBox%}
                </div>
        </fieldset>

diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl
index 784ddd63d64d380644545f8ec3aa780351214033..3dc881d277a21e49bffe12e39b1569bb09dca208 100644 (file)
--- a/templates/de/html/member/member_surfbar_edit_action_form.tpl
+++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl
@@ -6,24 +6,25 @@
        </div>
 
        <fieldset id="url_data">
+               <legend>{--MEMBER_SURFBAR_EDIT_URL_LEGEND--}</legend>
                <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-                       <label class="member_label" for="url">{--MEMBER_EDIT_SURFBAR_CHANGE_URL--}</legend><br />
+                       <label class="member_label" for="url">{--MEMBER_EDIT_SURFBAR_CHANGE_URL--}</label><br />
                        <input type="text" class="form_field" name="url" size="20" maxlength="255" value="$content[url]" />
                </div>
 
                <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-                       <label class="member_label" for="limited">{--MEMBER_SURFBAR_URL_LIMITED--}</legend><br />
+                       <label class="member_label" for="limited">{--MEMBER_SURFBAR_URL_LIMITED--}</label><br />
                        <input type="radio" id="limited_no" onfocus="return FocusLimitedNo()" name="limited" value="N"$content[limited_no] /> {--NO--}
                        <input type="radio" id="limited_yes" onfocus="return FocusLimitedYes()" name="limited" value="Y"$content[limited_yes] /> {--YES--}
                </div>
 
                <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-                       <label class="member_label" for="limit">{--MEMBER_SURFBAR_URL_ENTER_LIMIT--}</legend><br />
+                       <label class="member_label" for="limit">{--MEMBER_SURFBAR_URL_ENTER_LIMIT--}</label><br />
                        <input type="text" class="form_field" id="limit" name="limit" size="7" maxlength="20" value="$content[url_views_max]" />
                </div>
 
                <div class="member_input" style="padding-top:5px;padding-bottom:5px" align="center">
-                       <label class="member_label" for="package">{--MEMBER_SURFBAR_URL_SELECT_PACKAGE--}</legend>
+                       <label class="member_label" for="package">{--MEMBER_SURFBAR_URL_SELECT_PACKAGE--}</label>
                        {%pipe,generateMemberSurfbarPackageSelectionBox%}
                </div>
        </fieldset>