Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Added notes column to links. Can add/edit/save them in linkmanager.

Browse Source 
Update/install scripts updated for new column.
added new methods get_linkobjects() and get_linkobjectsbyname()


git-svn-id: http://svn.automattic.com/wordpress/trunk@265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
mikelittle 2003-07-23 00:26:03 +00:00
parent 3bc9d650ba
commit 81d1deec51
5 changed files with 211 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/b2-2-wp.php
View File

@ -123,6 +123,7 @@ if (!$got_links) {
" link_rating int NOT NULL DEFAULT '0', " . " link_rating int NOT NULL DEFAULT '0', " .
" link_updated DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', " . " link_updated DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', " .
" link_rel varchar(255) NOT NULL default '', " . " link_rel varchar(255) NOT NULL default '', " .
" link_notes MEDIUMTEXT NOT NULL default '', " .
" PRIMARY KEY (link_id) " . " PRIMARY KEY (link_id) " .
") "; ") ";
$result = mysql_query($sql) or print ("Can't create the table '$tablelinks' in the database.<br />" . $sql . "<br />" . mysql_error()); $result = mysql_query($sql) or print ("Can't create the table '$tablelinks' in the database.<br />" . $sql . "<br />" . mysql_error());

213
wp-admin/linkmanager.php
View File

@ -33,25 +33,25 @@ require_once("../wp-links/links.php");
$title = 'Manage Links'; $title = 'Manage Links';
function add_magic_quotes($array) { function add_magic_quotes($array) {
foreach ($array as $k => $v) { foreach ($array as $k => $v) {
if (is_array($v)) { if (is_array($v)) {
$array[$k] = add_magic_quotes($v); $array[$k] = add_magic_quotes($v);
} else { } else {
$array[$k] = addslashes($v); $array[$k] = addslashes($v);
} }
} }
return $array; return $array;
} }
if (!get_magic_quotes_gpc()) { if (!get_magic_quotes_gpc()) {
$HTTP_GET_VARS = add_magic_quotes($HTTP_GET_VARS); $HTTP_GET_VARS = add_magic_quotes($HTTP_GET_VARS);
$HTTP_POST_VARS = add_magic_quotes($HTTP_POST_VARS); $HTTP_POST_VARS = add_magic_quotes($HTTP_POST_VARS);
$HTTP_COOKIE_VARS = add_magic_quotes($HTTP_COOKIE_VARS); $HTTP_COOKIE_VARS = add_magic_quotes($HTTP_COOKIE_VARS);
} }
$b2varstoreset = array('action','standalone','cat_id', 'linkurl', 'name', 'image', $b2varstoreset = array('action','standalone','cat_id', 'linkurl', 'name', 'image',
'description', 'visible', 'target', 'category', 'link_id', 'description', 'visible', 'target', 'category', 'link_id',
'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel'); 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes');
for ($i=0; $i<count($b2varstoreset); $i += 1) { for ($i=0; $i<count($b2varstoreset); $i += 1) {
$b2var = $b2varstoreset[$i]; $b2var = $b2varstoreset[$i];
if (!isset($$b2var)) { if (!isset($$b2var)) {
@ -70,7 +70,7 @@ for ($i=0; $i<count($b2varstoreset); $i += 1) {
$links_show_cat_id = $HTTP_COOKIE_VARS["links_show_cat_id"]; $links_show_cat_id = $HTTP_COOKIE_VARS["links_show_cat_id"];
$links_show_order = $HTTP_COOKIE_VARS["links_show_order"]; $links_show_order = $HTTP_COOKIE_VARS["links_show_order"];
// error_log("start, links_show_cat_id=$links_show_cat_id"); // error_log("start, links_show_cat_id=$links_show_cat_id");
switch ($action) { switch ($action) {
case 'Add': case 'Add':
@ -87,6 +87,7 @@ switch ($action) {
$link_visible = $HTTP_POST_VARS["visible"]; $link_visible = $HTTP_POST_VARS["visible"];
$link_rating = $HTTP_POST_VARS["rating"]; $link_rating = $HTTP_POST_VARS["rating"];
$link_rel = $HTTP_POST_VARS["rel"]; $link_rel = $HTTP_POST_VARS["rel"];
$link_notes = $HTTP_POST_VARS["notes"];
$auto_toggle = get_autotoggle($link_category); $auto_toggle = get_autotoggle($link_category);
if ($user_level < $minadminlevel) if ($user_level < $minadminlevel)
@ -97,12 +98,11 @@ switch ($action) {
if (($auto_toggle == 'Y') && ($link_visible == 'Y')) { if (($auto_toggle == 'Y') && ($link_visible == 'Y')) {
$wpdb->query("UPDATE $tablelinks set link_visible = 'N' WHERE link_category = $link_category"); $wpdb->query("UPDATE $tablelinks set link_visible = 'N' WHERE link_category = $link_category");
} }
$wpdb->query("INSERT INTO $tablelinks (link_url, link_name, link_image, link_target, link_category, link_description, link_visible, link_owner, link_rating, link_rel, link_notes) " .
$wpdb->query("INSERT INTO $tablelinks (link_url, link_name, link_image, link_target, link_category, link_description, link_visible, link_owner, link_rating, link_rel) " .
" VALUES('" . addslashes($link_url) . "','" " VALUES('" . addslashes($link_url) . "','"
. addslashes($link_name) . "', '" . addslashes($link_name) . "', '"
. addslashes($link_image) . "', '$link_target', $link_category, '" . addslashes($link_image) . "', '$link_target', $link_category, '"
. addslashes($link_description) . "', '$link_visible', $user_ID, $link_rating, '" . addslashes($link_rel) ."')"); . addslashes($link_description) . "', '$link_visible', $user_ID, $link_rating, '" . addslashes($link_rel) . "', '" . addslashes($link_notes) . "')");
header('Location: linkmanager.php'); header('Location: linkmanager.php');
break; break;
@ -134,6 +134,7 @@ switch ($action) {
$link_visible = $HTTP_POST_VARS["visible"]; $link_visible = $HTTP_POST_VARS["visible"];
$link_rating = $HTTP_POST_VARS["rating"]; $link_rating = $HTTP_POST_VARS["rating"];
$link_rel = $HTTP_POST_VARS["rel"]; $link_rel = $HTTP_POST_VARS["rel"];
$link_notes = $HTTP_POST_VARS["notes"];
$auto_toggle = get_autotoggle($link_category); $auto_toggle = get_autotoggle($link_category);
if ($user_level < $minadminlevel) if ($user_level < $minadminlevel)
@ -150,7 +151,8 @@ switch ($action) {
" link_target='$link_target',\n link_category=$link_category,\n " . " link_target='$link_target',\n link_category=$link_category,\n " .
" link_visible='$link_visible',\n link_description='" . addslashes($link_description) . "',\n " . " link_visible='$link_visible',\n link_description='" . addslashes($link_description) . "',\n " .
" link_rating=$link_rating,\n" . " link_rating=$link_rating,\n" .
" link_rel='" . addslashes($link_rel) . "'\n" . " link_rel='" . addslashes($link_rel) . "',\n" .
" link_notes='" . addslashes($link_notes) . "'\n" .
" WHERE link_id=$link_id"); " WHERE link_id=$link_id");
//error_log($sql); //error_log($sql);
} // end if save } // end if save
@ -173,7 +175,7 @@ switch ($action) {
if (isset($links_show_cat_id) && ($links_show_cat_id != '')) if (isset($links_show_cat_id) && ($links_show_cat_id != ''))
$cat_id = $links_show_cat_id; $cat_id = $links_show_cat_id;
if (!isset($cat_id) || ($cat_id == '')) { if (!isset($cat_id) || ($cat_id == '')) {
if (!isset($links_show_cat_id) || ($links_show_cat_id == '')) if (!isset($links_show_cat_id) || ($links_show_cat_id == ''))
$cat_id = 'All'; $cat_id = 'All';
@ -183,7 +185,7 @@ switch ($action) {
header("Location: linkmanager.php"); header("Location: linkmanager.php");
break; break;
} // end Delete } // end Delete
case 'linkedit': case 'linkedit':
{ {
$standalone=0; $standalone=0;
@ -192,12 +194,12 @@ switch ($action) {
die("You have no right to edit the links for this blog.<br />Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a>. :)"); die("You have no right to edit the links for this blog.<br />Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a>. :)");
} }
$row = $wpdb->get_row("SELECT link_url, link_name, link_image, link_target, link_description, link_visible, link_category AS cat_id, link_rating, link_rel " . $row = $wpdb->get_row("SELECT link_url, link_name, link_image, link_target, link_description, link_visible, link_category AS cat_id, link_rating, link_rel, link_notes " .
" FROM $tablelinks " . " FROM $tablelinks " .
" WHERE link_id = $link_id"); " WHERE link_id = $link_id");
if ($row) { if ($row) {
$link_url = $row->link_url; $link_url = stripslashes($row->link_url);
$link_name = stripslashes($row->link_name); $link_name = stripslashes($row->link_name);
$link_image = $row->link_image; $link_image = $row->link_image;
$link_target = $row->link_target; $link_target = $row->link_target;
@ -206,13 +208,15 @@ switch ($action) {
$link_visible = $row->link_visible; $link_visible = $row->link_visible;
$link_rating = $row->link_rating; $link_rating = $row->link_rating;
$link_rel = stripslashes($row->link_rel); $link_rel = stripslashes($row->link_rel);
$link_notes = stripslashes($row->link_notes);
} }
?> ?>
<div class="wrap"> <div class="wrap">
<table width="95%" cellpadding="5" cellspacing="0" border="0"><form name="editlink" method="post"> <table width="95%" cellpadding="5" cellspacing="0" border="0">
<form name="editlink" method="post">
<input type="hidden" name="action" value="editlink" /> <input type="hidden" name="action" value="editlink" />
<input type="hidden" name="link_id" value="<?php echo $link_id; ?>" /> <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
<input type="hidden" name="order_by" value="<?php echo $order_by ?>" /> <input type="hidden" name="order_by" value="<?php echo $order_by ?>" />
@ -220,30 +224,35 @@ switch ($action) {
<tr> <tr>
<td colspan="2"><b>Edit</b> a link:</td> <td colspan="2"><b>Edit</b> a link:</td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">URL:</td> <td height="20" align="right">URL:</td>
<td><input type="text" name="linkurl" size="80" value="<?php echo $link_url; ?>"></td> <td><input type="text" name="linkurl" size="80" value="<?php echo $link_url; ?>"></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Display Name/Alt text:</td> <td height="20" align="right">Display Name/Alt text:</td>
<td><input type="text" name="name" size="80" value="<?php echo $link_name; ?>"></td> <td><input type="text" name="name" size="80" value="<?php echo $link_name; ?>"></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Image:</td> <td height="20" align="right">Image:</td>
<td><input type="text" name="image" size="80" value="<?php echo $link_image; ?>"></td> <td><input type="text" name="image" size="80" value="<?php echo $link_image; ?>"></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Description:</td> <td height="20" align="right">Description:</td>
<td><input type="text" name="description" size="80" value="<?php echo $link_description; ?>"></td> <td><input type="text" name="description" size="80" value="<?php echo $link_description; ?>"></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Rel:</td> <td height="20" align="right">Rel:</td>
<td><input type="text" name="rel" size="80" value="<?php echo $link_rel; ?>"></td> <td><input type="text" name="rel" size="80" value="<?php echo $link_rel; ?>"></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" valign="top" align="right">Notes:</td>
<td><textarea name="notes" cols="80" rows="10"><?php echo $link_notes; ?></textarea></td>
</tr>
<tr height="20">
<td height="20" align="right">Rating:</td> <td height="20" align="right">Rating:</td>
<td> <select name="rating" size="1"> <td>
<?php <select name="rating" size="1">
<?php
for ($r = 0; $r < 10; $r++) { for ($r = 0; $r < 10; $r++) {
echo(' <option value="'.$r.'" '); echo(' <option value="'.$r.'" ');
if ($link_rating == $r) if ($link_rating == $r)
@ -251,37 +260,33 @@ switch ($action) {
echo('>'.$r.'</option>'); echo('>'.$r.'</option>');
} }
?> ?>
</select> </select>&nbsp;(Leave at 0 for no rating.)
&nbsp;(Leave at 0 for no rating.) </td>
</tr>
<tr height="20">
<td height="20" align="right">Target:</td>
<td><label>
<input type="radio" name="target" value="_blank" <?php echo(($link_target == '_blank') ? 'checked="checked"' : ''); ?>>
_blank</label> &nbsp;
<label>
<input type="radio" name="target" value="_top" <?php echo(($link_target == '_top') ? 'checked="checked"' : ''); ?>>
_top</label> &nbsp;
<label>
<input type="radio" name="target" value="" <?php echo(($link_target == '') ? 'checked="checked"' : ''); ?>>
none</label>
</td> </td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Visible:</td> <td height="20" align="right">Target:</td>
<td><label> <td><label><input type="radio" name="target" value="_blank" <?php echo(($link_target == '_blank') ? 'checked="checked"' : ''); ?>> _blank</label>
<input type="radio" name="visible" checked="checked" value="Y"> &nbsp;<label><input type="radio" name="target" value="_top" <?php echo(($link_target == '_top') ? 'checked="checked"' : ''); ?>> _top</label>
Y</label> &nbsp; <label> &nbsp;<label><input type="radio" name="target" value="" <?php echo(($link_target == '') ? 'checked="checked"' : ''); ?>> none</label>
<input type="radio" name="visible" value="N"> </td>
N</label></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Category:</td> <td height="20" align="right">Visible:</td>
<td> <td><label>
<?php <input type="radio" name="visible" checked="checked" value="Y">
Yes</label>
&nbsp;<label>
<input type="radio" name="visible" value="N">
No</label>
</td>
</tr>
<tr height="20">
<td height="20" align="right"><label for="category">Category</label>:</td>
<td>
<?php
$results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id"); $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id");
echo " <select name=\"category\" size=\"1\">\n"; echo " <select name=\"category\" size=\"1\">\n";
foreach($results as $row) { foreach ($results as $row) {
echo " <option value=\"".$row->cat_id."\""; echo " <option value=\"".$row->cat_id."\"";
if ($row->cat_id == $link_category) if ($row->cat_id == $link_category)
echo " selected"; echo " selected";
@ -294,10 +299,10 @@ switch ($action) {
?> ?>
</td> </td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td colspan="2" align="center"> <input type="submit" name="submit" value="Save" class="search"> <td colspan="2" align="center">
&nbsp; <input type="submit" name="submit" value="Save" class="search">&nbsp;
<input type="submit" name="submit" value="Cancel" class="search"></a> <input type="submit" name="submit" value="Cancel" class="search">
</td> </td>
</tr> </tr>
</table> </table>
@ -329,7 +334,7 @@ switch ($action) {
{ {
if (isset($links_show_cat_id) && ($links_show_cat_id != '')) if (isset($links_show_cat_id) && ($links_show_cat_id != ''))
$cat_id = $links_show_cat_id; $cat_id = $links_show_cat_id;
if (!isset($cat_id) || ($cat_id == '')) { if (!isset($cat_id) || ($cat_id == '')) {
if (!isset($links_show_cat_id) || ($links_show_cat_id == '')) if (!isset($links_show_cat_id) || ($links_show_cat_id == ''))
$cat_id = 'All'; $cat_id = 'All';
@ -337,7 +342,7 @@ switch ($action) {
$links_show_cat_id = $cat_id; $links_show_cat_id = $cat_id;
if (isset($links_show_order) && ($links_show_order != '')) if (isset($links_show_order) && ($links_show_order != ''))
$order_by = $links_show_order; $order_by = $links_show_order;
if (!isset($order_by) || ($order_by == '')) if (!isset($order_by) || ($order_by == ''))
$order_by = 'order_name'; $order_by = 'order_name';
$links_show_order = $order_by; $links_show_order = $order_by;
@ -357,17 +362,21 @@ switch ($action) {
case 'order_desc': $sqlorderby = 'description'; break; case 'order_desc': $sqlorderby = 'description'; break;
case 'order_owner': $sqlorderby = 'owner'; break; case 'order_owner': $sqlorderby = 'owner'; break;
case 'order_rating': $sqlorderby = 'rating'; break; case 'order_rating': $sqlorderby = 'rating'; break;
case 'order_name': case 'order_name':
default: $sqlorderby = 'name'; break; default: $sqlorderby = 'name'; break;
} }
if ($action != "popup") { if ($action != "popup") {
?> ?>
<div class="wrap"> <div class="wrap">
<form name="cats" method="post"> <form name="cats" method="post">
<table width="75%" cellpadding="5" cellspacing="0" border="0"> <table width="75%" cellpadding="5" cellspacing="0" border="0">
<tr><td><b>Link Categories:</b></td><td><a href="linkcategories.php">Manage Link Categories</a></td><td><a href="links.import.php">Import Blogroll</a></td></tr> <tr>
<td><b>Link Categories:</b></td>
<td><a href="linkcategories.php">Manage Link Categories</a></td>
<td><a href="links.import.php">Import Blogroll</a></td>
</tr>
<tr> <tr>
<td> <td>
<b>Show</b> links in category:<br /> <b>Show</b> links in category:<br />
@ -418,17 +427,17 @@ switch ($action) {
<div class="wrap"> <div class="wrap">
<form name="links" id="links" method="post"> <form name="links" id="links" method="post">
<input type="hidden" name="link_id" value="" /> <input type="hidden" name="link_id" value="" />
<input type="hidden" name="action" value="" /> <input type="hidden" name="action" value="" />
<input type="hidden" name="order_by" value="<?php echo $order_by ?>" /> <input type="hidden" name="order_by" value="<?php echo $order_by ?>" />
<input type="hidden" name="cat_id" value="<?php echo $cat_id ?>" /> <input type="hidden" name="cat_id" value="<?php echo $cat_id ?>" />
<table width="100%" border="0" cellspacing="0" cellpadding="5"> <table width="100%" border="0" cellspacing="0" cellpadding="5">
<tr> <tr>
<th width="15%">Name</th> <th width="15%">Name</th>
<th>URL</th> <th>URL</th>
<th>Category</th> <th>Category</th>
<th>Relevance</th> <th>Relationship</th>
<th>Image</th> <th>Image</th>
<th>Visible</th> <th>Visible</th>
<th>&nbsp;</th> <th>&nbsp;</th>
@ -441,7 +450,7 @@ switch ($action) {
FROM $tablelinks FROM $tablelinks
LEFT JOIN $tablelinkcategories ON $tablelinks.link_category = $tablelinkcategories.cat_id LEFT JOIN $tablelinkcategories ON $tablelinks.link_category = $tablelinkcategories.cat_id
LEFT JOIN $tableusers on $tableusers.ID = $tablelinks.link_owner "; LEFT JOIN $tableusers on $tableusers.ID = $tablelinks.link_owner ";
// have we got a where clause? // have we got a where clause?
if (($use_adminlevels) || (isset($cat_id) && ($cat_id != 'All')) ) { if (($use_adminlevels) || (isset($cat_id) && ($cat_id != 'All')) ) {
$sql .= " WHERE "; $sql .= " WHERE ";
@ -464,30 +473,34 @@ switch ($action) {
$links = $wpdb->get_results($sql); $links = $wpdb->get_results($sql);
if ($links) { if ($links) {
foreach ($links as $link) { foreach ($links as $link) {
$short_url = str_replace('http://', '', $link->link_url); $short_url = str_replace('http://', '', stripslashes($link->link_url));
$short_url = str_replace('www.', '', $short_url); $short_url = str_replace('www.', '', $short_url);
if ('/' == substr($short_url, -1)) $short_url = substr($short_url, 0, -1); if ('/' == substr($short_url, -1))
if (strlen($short_url) > 35) $short_url = substr($short_url, 0, 32).'...'; $short_url = substr($short_url, 0, -1);
if (strlen($short_url) > 35)
$short_url = substr($short_url, 0, 32).'...';
$link->link_name = stripslashes($link->link_name); $link->link_name = stripslashes($link->link_name);
$link->category = stripslashes($link->category); $link->category = stripslashes($link->category);
$link->link_rel = stripslashes($link->link_rel); $link->link_rel = stripslashes($link->link_rel);
$link->link_description = stripslashes($link->link_description);
$image = ($link->link_image != null) ? 'Yes' : 'No'; $image = ($link->link_image != null) ? 'Yes' : 'No';
$visible = ($link->link_visible == 'Y') ? 'Yes' : 'No'; $visible = ($link->link_visible == 'Y') ? 'Yes' : 'No';
++$i; ++$i;
$style = ($i % 2) ? ' class="alternate"' : ''; $style = ($i % 2) ? ' class="alternate"' : '';
echo <<<LINKS echo <<<LINKS
<tr valign="middle"$style> <tr valign="middle"$style>
<td><strong>$link->link_name</strong><br /> <td><strong>$link->link_name</strong><br />
Description: $link->link_description</td> Description: $link->link_description</td>
<td><a href="$link->link_url" title="Visit $link->link_name">$short_url</a></td> <td><a href="$link->link_url" title="Visit $link->link_name">$short_url</a></td>
<td>$link->category</td> <td>$link->category</td>
<td>$link->link_rel</td> <td>$link->link_rel</td>
<td>$image</td> <td>$image</td>
<td>$visible</td> <td>$visible</td>
<td><input type="submit" name="edit" onclick="document.forms['links'].link_id.value='$link->link_id'; document.forms['links'].action.value='linkedit'; " value="Edit" class="search" /></td> <td><input type="submit" name="edit" onclick="document.forms['links'].link_id.value='$link->link_id'; document.forms['links'].action.value='linkedit'; " value="Edit" class="search" /></td>
<td><input type="submit" name="delete" onclick="document.forms['links'].link_id.value='$link->link_id'; document.forms['links'].action.value='Delete'; return confirm('You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.'); " value="Delete" class="search" /></td> <td><input type="submit" name="delete" onclick="document.forms['links'].link_id.value='$link->link_id'; document.forms['links'].action.value='Delete'; return confirm('You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.'); " value="Delete" class="search" /></td>
</tr> </tr>
LINKS; LINKS;
} }
} }
@ -511,7 +524,7 @@ LINKS;
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Display Name/Alt text:</td> <td height="20" align="right">Display Name/Alt text:</td>
<td><input type="text" name="name" size="80" value="<?php echo $name; ?>"></td> <td><input type="text" name="name" size="80" value="<?php echo $link_name; ?>"></td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Image:</td> <td height="20" align="right">Image:</td>
@ -525,6 +538,10 @@ LINKS;
<td height="20" align="right">Rel:</td> <td height="20" align="right">Rel:</td>
<td><input type="text" name="rel" size="80" value=""></td> <td><input type="text" name="rel" size="80" value=""></td>
</tr> </tr>
<tr height="20">
<td height="20" valign="top" align="right">Notes:</td>
<td><textarea name="notes" cols="80" rows="10"></textarea></td>
</tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Rating:</td> <td height="20" align="right">Rating:</td>
<td> <td>
@ -539,23 +556,23 @@ LINKS;
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Target:</td> <td height="20" align="right">Target:</td>
<td><label><input type="radio" name="target" value="_blank"> _blank</label> <td><label><input type="radio" name="target" value="_blank"> _blank</label>
&nbsp;<label><input type="radio" name="target" value="_top"> &nbsp;<label><input type="radio" name="target" value="_top"> _top</label>
_top</label>&nbsp;<label><input type="radio" name="target" value="" checked="checked"> &nbsp;<label><input type="radio" name="target" value="" checked="checked"> none</label>
none</label></td> </td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Visible:</td> <td height="20" align="right">Visible:</td>
<td><label> <td><label>
<input type="radio" name="visible" checked="checked" value="Y"> <input type="radio" name="visible" checked="checked" value="Y">
Y</label> Yes</label>
&nbsp; &nbsp;<label>
<label> <input type="radio" name="visible" value="N">
<input type="radio" name="visible" value="N"> No</label>
N</label></td> </td>
</tr> </tr>
<tr height="20"> <tr height="20">
<td height="20" align="right">Category:</td> <td height="20" align="right"><label for="category">Category</label>:</td>
<td> <td>
<?php <?php
$results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id"); $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id");

24
wp-admin/upgrade-071-to-072.php
View File

@ -70,10 +70,30 @@ switch($step) {
you&#8217;re all ready, <a href="<?php echo $thisfile;?>?step=1">let's go</a>! </p> you&#8217;re all ready, <a href="<?php echo $thisfile;?>?step=1">let's go</a>! </p>
<?php <?php
break; break;
case 1: case 1:
?> ?>
<h1>Step 1</h1> <h1>Step 1</h1>
<p>There are some changes we need to make to the links tables with this version, so lets get those out of
the way.</p>
<?php
$error_count = 0;
$tablename = $tablelinks;
$ddl = "ALTER TABLE $tablelinks ADD COLUMN link_notes MEDIUMTEXT NOT NULL DEFAULT '' ";
maybe_add_column($tablename, 'link_notes', $ddl);
if (check_column($tablelinks, 'link_notes', 'mediumtext')) {
$res .= $tablename . ' - ok <br />';
} else {
$res .= 'There was a problem with ' . $tablename . '<br />';
++$error_count;
}
?>
<p>OK, that wasn't too bad was it? Let's move on to <a href="<?php echo $thisfile;?>?step=2">step 2</a>!</p>
<?php
case 2:
?>
<h1>Step 2</h1>
<p>There are a few new database tables with this version, so lets get those out of <p>There are a few new database tables with this version, so lets get those out of
the way.</p> the way.</p>
<?php <?php

72
wp-admin/wp-install-helper.php
View File

@ -73,4 +73,76 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
// else didn't find it // else didn't find it
return true; return true;
} }
/**
** check_column()
** Check column matches passed in criteria.
** Pass in null to skip checking that criteria
** Returns: true if it matches
** false otherwise
** (case sensitive) Column names returned from DESC table are:
** Field
** Type
** Null
** Key
** Default
** Extra
*/
function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
global $wpdb;
$diffs = 0;
$results = $wpdb->get_results("DESC $table_name");
foreach ($results as $row ) {
print_r($row);
if ($row->Field == $col_name) {
// got our column, check the params
echo ("checking $row->Type != $col_type\n");
if (($col_type != null) && ($row->Type != $col_type)) {
++$diffs;
}
if (($is_null != null) && ($row->Null != $is_null)) {
++$diffs;
}
if (($key != null) && ($row->Key != $key)) {
++$diffs;
}
if (($default != null) && ($row->Default != $default)) {
++$diffs;
}
if (($extra != null) && ($row->Extra != $extra)) {
++$diffs;
}
if ($diffs > 0)
return false;
return true;
} // end if found our column
}
return false;
}
/*
echo "<p>testing</p>";
echo "<pre>";
//check_column('wp_links', 'link_description', 'mediumtext');
//if (check_column($tablecomments, 'comment_author', 'tinytext'))
// echo "ok\n";
$error_count = 0;
$tablename = $tablelinks;
// check the column
if (!check_column($tablelinks, 'link_description', 'varchar(255)'))
{
$ddl = "ALTER TABLE $tablelinks MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
$q = $wpdb->query($ddl);
}
if (check_column($tablelinks, 'link_description', 'varchar(255)')) {
$res .= $tablename . ' - ok <br />';
} else {
$res .= 'There was a problem with ' . $tablename . '<br />';
++$error_count;
}
echo "</pre>";
*/
?> ?>

1
wp-admin/wp-install.php
View File

@ -113,6 +113,7 @@ if (!$got_links) {
" link_rating int NOT NULL DEFAULT '0', " . " link_rating int NOT NULL DEFAULT '0', " .
" link_updated DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', " . " link_updated DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', " .
" link_rel varchar(255) NOT NULL default '', " . " link_rel varchar(255) NOT NULL default '', " .
" link_notes MEDIUMTEXT NOT NULL default '', " .
" PRIMARY KEY (link_id) " . " PRIMARY KEY (link_id) " .
") "; ") ";
$result = mysql_query($sql) or print ("Can't create the table '$tablelinks' in the database.<br />" . $sql . "<br />" . mysql_error()); $result = mysql_query($sql) or print ("Can't create the table '$tablelinks' in the database.<br />" . $sql . "<br />" . mysql_error());