Extension notes and verbose SQL table rewritten to templates. Resolved #13
authorRoland Häder <roland@mxchange.org>
Mon, 22 Dec 2008 12:56:50 +0000 (12:56 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 22 Dec 2008 12:56:50 +0000 (12:56 +0000)
.gitattributes
inc/databases.php
inc/extensions.php
templates/de/html/admin/admin_ext_notes.tpl [new file with mode: 0644]
templates/de/html/admin/admin_ext_sql_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_ext_sql_table.tpl [new file with mode: 0644]
templates/de/html/admin/admin_extensions_text.tpl

index a5f1534..c0c87f7 100644 (file)
@@ -955,7 +955,10 @@ templates/de/html/admin/admin_edit_user.tpl -text
 templates/de/html/admin/admin_email_archiv.tpl -text
 templates/de/html/admin/admin_email_archiv_row.tpl -text
 templates/de/html/admin/admin_email_nav_row.tpl -text
+templates/de/html/admin/admin_ext_notes.tpl -text
 templates/de/html/admin/admin_ext_reg_form.tpl -text
+templates/de/html/admin/admin_ext_sql_row.tpl -text
+templates/de/html/admin/admin_ext_sql_table.tpl -text
 templates/de/html/admin/admin_extensions.tpl -text
 templates/de/html/admin/admin_extensions_404.tpl -text
 templates/de/html/admin/admin_extensions_delete.tpl -text
index b1de138..50d4e69 100644 (file)
@@ -115,7 +115,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "692");
+define('CURR_SVN_REVISION', "693");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
index 5abc675..a59e17b 100644 (file)
@@ -152,20 +152,8 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                        // Load extension in update mode
                        LOAD_EXTENSION($ext_name, "update", $ver, $dry_run, $SQLs);
 
-                       // Do we have an update?
-                       if (((GET_EXT_VERSION("sql_patches") != "") && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
-                               if (!empty($UPDATE_NOTES)) {
-                                       // Update notes found
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$ver.":</strong><br />".$UPDATE_NOTES."</div>");
-                                       $UPDATE_NOTES = "";
-                               } elseif (($ver == "0.0") || ($ver == "0.0.0")) {
-                                       // Initial release
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$ver.":</strong><br />".INITIAL_RELEASE."</div>");
-                               } else {
-                                       // No update notes found!
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$ver.":</strong><br /><I>".NO_UPDATE_NOTES."</I></div>");
-                               }
-                       } // END - if
+                       // Add update notes to our output
+                       $NOTES .= ADD_EXTENSION_NOTES($ver, $UPDATE_NOTES);
                } // END - foreach
 
                // Does this extension depends on an outstanding update of another update?
@@ -424,6 +412,9 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        // Init arrays
        $SQLs = array(); $INC_POOL = array();
 
+       // Init notes
+       $NOTES = "";
+
        // Only admins are allowed to update extensions
        if ((!IS_ADMIN()) || (empty($ext_name))) return false;
 
@@ -440,7 +431,6 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        if ((($EXT_VERSION != $ext_ver) || ($dry_run)) && (is_array($history))) {
                // Search for starting point
                $start = array_search($ext_ver, $history);
-               $NOTES = "";
 
                // And load SQL queries in order of version history
                for ($idx = ($start + 1); $idx < sizeof($history); $idx++) {
@@ -469,18 +459,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                        } // END - if
 
                        // Add notes
-                       if (getConfig('verbose_sql') == "Y") {
-                               if (!empty($UPDATE_NOTES)) {
-                                       // Update notes found
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$cacheArray['update_ver'][$ext_name].":</strong><br />".$UPDATE_NOTES."</div>");
-                                       $UPDATE_NOTES = "";
-                               } elseif ($cacheArray['update_ver'][$ext_name] == "0.0") {
-                                       // Initial release
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$cacheArray['update_ver'][$ext_name].":</strong><br />".INITIAL_RELEASE."</div>");
-                               } else {
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$cacheArray['update_ver'][$ext_name].":</strong><br /><I>".NO_UPDATE_NOTES."</I></div>");
-                               }
-                       } // END - if
+                       $NOTES .= ADD_EXTENSION_NOTES($cacheArray['update_ver'][$ext_name], $UPDATE_NOTES);
                } // END - for
 
                // In real-mode execute any existing includes
@@ -526,48 +505,47 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUT
        } // END - if
 
        // Init variables
-       $S = false; $SW = 2; $i = 1;
+       $SW = 2; $i = 1;
        $OUT = "";
 
        // Do we have queries?
        if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
-               $OUT  = "<div align=\"center\">
-<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"".$width."\" align=\"center\"".$dashed.">
-<tr>
-  <td colspan=\"2\" align=\"center\" class=\"admin_title bottom2\" height=\"24\">
-    <strong>".$title.":</strong>
-  </td>
-</tr>\n";
                foreach ($SQLs as $idx => $sql) {
+                       // Trim out spaces
                        $sql = trim($sql);
+
+                       // Output command if set
                        if (!empty($sql)) {
-                               $S = true;
-                               $OUT .= "<tr>
-  <td class=\"switch_sw".(3 - $SW)." bottom2\" style=\"padding-left: 2px\" width=\"30\">".$i.".</td>
-  <td class=\"switch_sw".(3 - $SW)." bottom2\" style=\"padding-left: 5px; padding-right: 5px\">
-    ".$sql."
-  </td>
-</tr>\n";
-                               if ($switch) $SW = 3 - $SW;
+                               // Prepare output for template
+                               $content = array(
+                                       'sw'  => $SW,
+                                       'i'   => $i,
+                                       'sql' => $sql
+                               );
+
+                               // Load row template
+                               $OUT .= LOAD_TEMPLATE("admin_ext_sql_row", true, $content);
+
+                               // Switch color and count up
+                               $SW = 3 - $SW;
                                $i++;
-                       }
-               }
-       }
+                       } // END - if
+               } // END - foreach
 
-       if ((!$S) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
-               // No addional SQL commands to run
-               $OUT .= "<tr>
-  <td colspan=\"2\" align=\"center\" class=\"switch_sw2 bottom2\" height=\"24\">
-    <font class=\"admin_note\">".ADMIN_NO_ADDIONAL_SQLS."</font>
-  </td>
-</tr>\n";
-       }
+               // Prepare content for template
+               $content = array(
+                       'width'  => $width,
+                       'dashed' => $dashed,
+                       'title'  => $title,
+                       'out'    => $OUT
+               );
 
-       if (!empty($OUT)) {
-               // Add missing close-table tag
-               $OUT .= "</table>
-</div>\n";
-       }
+               // Load main template
+               $OUT = LOAD_TEMPLATE("admin_ext_sql_table", true, $content);
+       } elseif ((GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
+               // No addional SQL commands to run
+               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_ADDITIONAL_SQLS);
+       } // END - if
 
        // Return output
        return $OUT;
@@ -826,5 +804,43 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) {
        return $task_id;
 }
 
+// Add updates notes for given version
+function ADD_EXTENSION_NOTES ($ver, &$UPDATE_NOTES) {
+       // Init notes/content
+       $out = ""; $content = array();
+
+       // Is do we have verbose output enabled?
+       if ((getConfig('verbose_sql') == "Y") || (!EXT_IS_ACTIVE("sql_patches"))) {
+
+               // Update notes found?
+               if (!empty($UPDATE_NOTES)) {
+                       // Update notes found
+                       $content = array(
+                               'ver'   => $ver,
+                               'notes' => $UPDATE_NOTES
+                       );
+                       $UPDATE_NOTES = "";
+               } elseif (($ver == "0.0") || ($ver == "0.0.0")) {
+                       // Initial release
+                       $content = array(
+                               'ver'   => $ver,
+                               'notes' => INITIAL_RELEASE
+                       );
+               } else {
+                       // No update notes found!
+                       $content = array(
+                               'ver'   => $ver,
+                               'notes' => NO_UPDATE_NOTES
+                       );
+               }
+
+               // Load template
+               $out = LOAD_TEMPLATE("admin_ext_notes", true, $content);
+       } // END - if
+
+       // Return the output
+       return $out;
+}
+
 //
 ?>
diff --git a/templates/de/html/admin/admin_ext_notes.tpl b/templates/de/html/admin/admin_ext_notes.tpl
new file mode 100644 (file)
index 0000000..ca76eba
--- /dev/null
@@ -0,0 +1,4 @@
+<div class="update_notes">
+       <strong>v$content[ver]:</strong><br />
+       $content[notes]
+</div>
diff --git a/templates/de/html/admin/admin_ext_sql_row.tpl b/templates/de/html/admin/admin_ext_sql_row.tpl
new file mode 100644 (file)
index 0000000..5536c6a
--- /dev/null
@@ -0,0 +1,6 @@
+<tr>
+  <td class="switch_sw$content[sw] bottom2" style="padding-left: 2px" width="30">$content[i].</td>
+  <td class="switch_sw$content[sw] bottom2" style="padding-left: 5px; padding-right: 5px">
+    $content[sql]
+  </td>
+</tr>
diff --git a/templates/de/html/admin/admin_ext_sql_table.tpl b/templates/de/html/admin/admin_ext_sql_table.tpl
new file mode 100644 (file)
index 0000000..9634e11
--- /dev/null
@@ -0,0 +1,10 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="$content[width]" align="center"$content[dashed]>
+<tr>
+  <td colspan="2" align="center" class="admin_title bottom2" height="24">
+    <strong>$content[title]:</strong>
+  </td>
+</tr>
+$content[out]
+</table>
+</div>
index db42929..a80a751 100644 (file)
@@ -1,13 +1,13 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-       width="99%" class="admin_table">
-       <TR>
-               <TD height="10" class="seperator">&nbsp;</TD>
-       </TR>
-       <TR>
-               <TD style="padding-left: 5px"><FONT class="tiny">$content</FONT>
-               </TD>
-       </TR>
-       <TR>
-               <TD height="10" class="seperator">&nbsp;</TD>
-       </TR>
-</TABLE>
+<table border="0" cellspacing="0" cellpadding="0" align="center" width="99%" class="admin_table">
+       <tr>
+               <td height="10" class="seperator">&nbsp;</td>
+       </tr>
+       <tr>
+               <td style="padding-left: 5px">
+                       <span class="tiny">$content</span>
+               </td>
+       </tr>
+       <tr>
+               <td height="10" class="seperator">&nbsp;</td>
+       </tr>
+</table>