diff --git a/wp-admin/b2.css b/wp-admin/b2.css index ff9538bb77..0dac874424 100644 --- a/wp-admin/b2.css +++ b/wp-admin/b2.css @@ -12,7 +12,9 @@ #wphead a span { display: none; } - +p { + line-height: 130%; +} #adminmenu { list-style: none outside; padding: 0; @@ -65,10 +67,13 @@ a:hover { color: #069; } -.panelbody { - /* empty style - for you to customize it. - this style applies to b2's interface, the part where the sections are displayed */ +h2 { + margin: 0 5px 2px 5px; + padding: 3px; + color: #333; + border-bottom: 2px solid #333; } + .table { color: #000000; font-size: 10pt; @@ -134,3 +139,33 @@ xmp { /* Just in case */ padding: 10px; } form { margin: 0; padding: 0; } /* thanks #mozilla */ + +td.menutop { + padding-top: 2px; + padding-bottom: 2px; + border-color: #999999; + border-top-width: 1px; + border-bottom-width: 1px; + border-left-width: 0px; + border-right-width: 0px; + border-style: dashed; +} +textarea, input, select { + background-color: #f0f0f0; + border-width: 1px; + border-color: #cccccc; + border-style: solid; + padding: 2px; + margin: 1px; + font-family: Georgia, "Times New Roman", Times, serif; +} +.checkbox { + background-color: #ffffff; + border-width: 0px; + padding: 0px; + margin: 0px; +} + +label { + font-weight: bold; +} \ No newline at end of file diff --git a/wp-admin/b2bookmarklet.php b/wp-admin/b2bookmarklet.php new file mode 100644 index 0000000000..208dba17b2 --- /dev/null +++ b/wp-admin/b2bookmarklet.php @@ -0,0 +1,255 @@ + */ + +$mode = "bookmarklet"; + +$standalone = 1; +require("b2header.php"); + +if ($user_level == 0) +die ("Cheatin' uh ?"); + +if ($a=="b") { + +?> + + + + + + + +WordPress > Bookmarklet + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + +
  + + + +
Title
+
Category
+
  + + + +
Post
+ + + + +
+ + + + + + +
+ tabindex="4" class="checkbox" id="autobr" /> + + +
+ + + + + + + + + + + + += $fileupload_minlevel) && ((ereg(" ".$user_login." ", $fileupload_allowedusers)) || (trim($fileupload_allowedusers)=="")) ) { ?> + + + + +
  +TrackBack an URL:
+ +
+
+ +
+ + +
+ + + + + + + +
+ + + \ No newline at end of file diff --git a/wp-admin/b2categories.php b/wp-admin/b2categories.php index d5aa31d820..b4f55fc8de 100644 --- a/wp-admin/b2categories.php +++ b/wp-admin/b2categories.php @@ -1,5 +1,5 @@ */ function add_magic_quotes($array) { @@ -37,114 +37,110 @@ for ($i=0; $i$cat_name"); + $query = "INSERT INTO $tablecategories (cat_ID,cat_name) VALUES ('0', '$cat_name')"; + $result = mysql_query($query) or die("Couldn't add category $cat_name"); - header("Location: b2categories.php"); + header('Location: b2categories.php'); break; -case "Delete": +case 'Delete': $standalone = 1; - require_once("./b2header.php"); + require_once('b2header.php'); - $cat_ID = $HTTP_POST_VARS["cat_ID"]; - $cat_name=get_catname($cat_ID); - $cat_name=addslashes($cat_name); + $cat_ID = intval($HTTP_POST_VARS["cat_ID"]); + $cat_name = get_catname($cat_ID); + $cat_name = addslashes($cat_name); - if ($cat_ID=="1") - die("Can't delete the $cat_name category: this is the default one"); + if (1 == $cat_ID) + die("Can't delete the $cat_name category: this is the default one"); if ($user_level < 3) - die ("Cheatin' uh ?"); + die ('Cheatin’ uh?'); - $query="DELETE FROM $tablecategories WHERE cat_ID=\"$cat_ID\""; - $result=mysql_query($query) or die("Couldn't delete category $cat_name".mysql_error()); + $query = "DELETE FROM $tablecategories WHERE cat_ID = $cat_ID"; + $result = mysql_query($query) or die("Couldn't delete category $cat_name".mysql_error()); - $query="UPDATE $tableposts SET post_category='1' WHERE post_category='$cat_ID'"; - $result=mysql_query($query) or die("Couldn't reset category on posts where category was $cat_name"); + $query = "UPDATE $tableposts SET post_category='1' WHERE post_category='$cat_ID'"; + $result = mysql_query($query) or die("Couldn't reset category on posts where category was $cat_name"); - header("Location: b2categories.php"); + header('Location: b2categories.php'); break; -case "Rename": +case 'Rename': - require_once ("./b2header.php"); - $cat_name=get_catname($HTTP_POST_VARS["cat_ID"]); - $cat_name=addslashes($cat_name); + require_once ('b2header.php'); + $cat_name = get_catname($HTTP_POST_VARS["cat_ID"]); + $cat_name = addslashes($cat_name); ?> - - -

Old name:

+ +
+

Old name:

- New name:
+ New name:
" />
- +
$cat_name: ".mysql_error()); + $query = "UPDATE $tablecategories SET cat_name='$cat_name' WHERE cat_ID = $cat_ID"; + $result = mysql_query($query) or die("Couldn't edit category $cat_name: ".mysql_error()); - header("Location: b2categories.php"); + header('Location: b2categories.php'); break; default: - $standalone=0; - require_once ("./b2header.php"); + $standalone = 0; + require_once ('b2header.php'); if ($user_level < 3) { - die("You have no right to edit the categories for this blog.
Ask for a promotion to your blog admin :)"); + die("You have no right to edit the categories for this blog.
Ask for a promotion to your blog admin. :)"); } ?> - - - - - -
+
- Edit a category:
+

Edit a category:

+

\n"; + $query = "SELECT * FROM $tablecategories ORDER BY cat_ID"; + $result = mysql_query($query); + echo "\n"; @@ -153,24 +149,27 @@ default:

-

- Add a category:
+ +

Add a category:


-
- + + -
- - Note:
- Deleting a category does not delete posts from that category.
It will just set them back to the default category . - + +
+

Note:
+ Deleting a category does not delete posts from that category, it will just + set them back to the default category . +

+
*/ -include("b2footer.php"); ?> \ No newline at end of file +include('b2footer.php'); +?> \ No newline at end of file diff --git a/wp-admin/b2edit.form.php b/wp-admin/b2edit.form.php index 4be4792137..bda3eb1ed5 100644 --- a/wp-admin/b2edit.form.php +++ b/wp-admin/b2edit.form.php @@ -1,38 +1,38 @@ +

'; + $form_pingback = '
'; } else { $form_pingback = ''; } if ($use_trackback) { - $form_trackback = '


'; + $form_trackback = '

(Seperate multiple URLs with commas.)

'; } else { $form_trackback = ''; } $colspan = 3; break; case "edit": - $submitbutton_text ="Edit this !"; - $toprow_title = "Editing Post #".$postdata["ID"]; - $form_action = "editpost"; - $form_extra = "\" />\n\n\n - + - - - - - - -
- - - - - +?> +
-
- +?> + + + +
+
+
-
+ +
 
+ + +
+ " tabindex="1" id="name" /> + +
+ " tabindex="2" id="email" /> + +
-
- " tabindex="1" id="name" />
-
- " tabindex="2" id="email" />
-
- " tabindex="3" id="URL" /> + +
+ " tabindex="3" id="URL" />
-
- - - -
-Excerpt :'; -} else { - echo '
'; -} -?> -
 
- -
-Post :'; + echo ''; +?> +

+ + +
+ + - + + +
+Post:'; } else { - echo '
'; + echo '
'; } ?> -
- - + +
-
- - - - - +

= $fileupload_minlevel) && ((ereg(" ".$user_login." ", $fileupload_allowedusers)) || (trim($fileupload_allowedusers)=="")) ) { ?> @@ -133,18 +130,11 @@ if ($action != 'editcomment') { echo $form_trackback; // if the level is 5+, allow user to edit the timestamp - not on 'new post' screen though -#if (($user_level > 4) && ($action != "post")) +// if (($user_level > 4) && ($action != "post")) if ($user_level > 4) { - touch_time(($action=="edit")); + touch_time(($action == 'edit')); } ?> - -
- + +
\ No newline at end of file diff --git a/wp-admin/b2edit.php b/wp-admin/b2edit.php index ad949d3dc6..507fca2fbd 100644 --- a/wp-admin/b2edit.php +++ b/wp-admin/b2edit.php @@ -40,7 +40,7 @@ switch($action) { case 'post': $standalone = 1; - require_once('./b2header.php'); + require_once('b2header.php'); $post_autobr = intval($HTTP_POST_VARS["post_autobr"]); $post_pingback = intval($HTTP_POST_VARS["post_pingback"]); @@ -52,7 +52,7 @@ case 'post': $post_category = intval($HTTP_POST_VARS["post_category"]); if ($user_level == 0) - die ("Cheatin' uh ?"); + die ("Cheatin' uh ?"); if (($user_level > 4) && (!empty($HTTP_POST_VARS["edit_date"]))) { $aa = $HTTP_POST_VARS["aa"]; @@ -67,10 +67,10 @@ case 'post': $ss = ($ss > 59) ? $ss - 60 : $ss; $now = "$aa-$mm-$jj $hh:$mn:$ss"; } else { - $now = date("Y-m-d H:i:s",(time() + ($time_difference * 3600))); + $now = date("Y-m-d H:i:s", (time() + ($time_difference * 3600))); } - $query = "INSERT INTO $tableposts (ID, post_author, post_date, post_content, post_title, post_category, post_excerpt) VALUES ('0','$user_ID','$now','$content','".$post_title."','".$post_category."','".$excerpt."')"; + $query = "INSERT INTO $tableposts (ID, post_author, post_date, post_content, post_title, post_category, post_excerpt) VALUES ('0','$user_ID','$now','$content','$post_title','$post_category','$excerpt')"; $result = mysql_query($query) or mysql_oops($query); $post_ID = mysql_insert_id(); @@ -79,7 +79,6 @@ case 'post': sleep($sleep_after_edit); } - rss_update($blog_ID); pingWeblogs($blog_ID); pingCafelog($cafelogID, $post_title, $post_ID); pingBlogs($blog_ID); @@ -117,25 +116,24 @@ case 'post': break; -case "edit": +case 'edit': - $standalone=0; - require_once ("./b2header.php"); - $post = $HTTP_GET_VARS["post"]; + $standalone = 0; + require_once('b2header.php'); + $post = $HTTP_GET_VARS['post']; if ($user_level > 0) { - $postdata=get_postdata($post) or die("Oops, no post with this ID. Go back !"); + $postdata=get_postdata($post) or die('Oops, no post with this ID. Go back!'); $authordata = get_userdata($postdata["Author_ID"]); if ($user_level < $authordata[13]) - die ("You don't have the right to edit ".$authordata[1]."'s posts."); + die ('You don’t have the right to edit '.$authordata[1].'’s posts.'); - $content = $postdata["Content"]; + $content = $postdata['Content']; $content = format_to_edit($content); - $excerpt = $postdata["Excerpt"]; + $excerpt = $postdata['Excerpt']; $excerpt = format_to_edit($excerpt); - $edited_post_title = format_to_edit($postdata["Title"]); + $edited_post_title = format_to_edit($postdata['Title']); - echo $blankline; - include("b2edit.form.php"); + include('b2edit.form.php'); } else { ?> @@ -190,7 +188,6 @@ case "editpost": sleep($sleep_after_edit); } - rss_update($blog_ID); // pingWeblogs($blog_ID); $location = "Location: b2edit.php"; @@ -225,31 +222,29 @@ case "delete": sleep($sleep_after_edit); } - rss_update($blog_ID); // pingWeblogs($blog_ID); - header ("Location: b2edit.php"); + header ('Location: b2edit.php'); break; -case "editcomment": +case 'editcomment': - $standalone=0; - require_once ("./b2header.php"); + $standalone = 0; + require_once ('b2header.php'); get_currentuserinfo(); if ($user_level == 0) { - die ("Cheatin' uh ?"); + die ('Cheatin’ uh?'); } $comment = $HTTP_GET_VARS['comment']; - $commentdata = get_commentdata($comment,1) or die("Oops, no comment with this ID. Go back !"); - $content = $commentdata["comment_content"]; + $commentdata = get_commentdata($comment, 1) or die('Oops, no comment with this ID. Go back!'); + $content = $commentdata['comment_content']; $content = format_to_edit($content); - - echo $blankline; - include("b2edit.form.php"); + + include('b2edit.form.php'); break; diff --git a/wp-admin/b2edit.showposts.php b/wp-admin/b2edit.showposts.php index 1e56b9f9a0..2a688a1234 100644 --- a/wp-admin/b2edit.showposts.php +++ b/wp-admin/b2edit.showposts.php @@ -1,6 +1,6 @@ +
-
+ 0) { ?> @@ -57,7 +57,7 @@ if ($previousXstart > 0) {
-
+ @@ -69,59 +69,57 @@ if ($previousXstart > 0) { - + - + - +  
-
+  to    
- +
-
- - +
@@ -137,7 +135,7 @@ if ($i == "ASC") while($row = mysql_fetch_object($result)) { echo ""; } ?> @@ -227,9 +225,7 @@ if ($i == "ASC")
- +
-
- - - - + -

- [ + [ $authordata[13]) or ($user_login == $authordata[1])) { - echo " - Edit"; - echo " - post_title."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete "; + echo " - post_title."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete "; } ?> ] @@ -280,8 +274,7 @@ if ($i == "ASC") if ($resultc) { ?> - -

:: comments

+

comments


- @
+ @ $authordata[13]) or ($user_login == $authordata[1])) { echo "[ Edit"; @@ -312,7 +305,7 @@ if ($i == "ASC") echo "

Error: please fill the required fields (name & comment)

"; ?> -

:: leave a comment

+

Leave Comment

@@ -324,7 +317,6 @@ if ($i == "ASC")


- Auto-BR (line-breaks become <br> tags)
@@ -338,19 +330,18 @@ if ($i == "ASC") } ?>
-
- -
- + +
+ +
- + + +
Show posts: Show posts: @@ -409,4 +400,4 @@ echo " selected";
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-admin/b2header.php b/wp-admin/b2header.php index cc58693f43..d1e3e54909 100644 --- a/wp-admin/b2header.php +++ b/wp-admin/b2header.php @@ -1,6 +1,6 @@ what_to_show; $archive_mode=$row->archive_mode; $time_difference=$row->time_difference; - $autobr=$row->AutoBR; $date_format=stripslashes($row->date_format); $time_format=stripslashes($row->time_format); } // let's deactivate quicktags on IE Mac and Lynx, because they don't work there. if (($is_macIE) || ($is_lynx)) - $use_quicktags=0; + $use_quicktags = 0; $b2varstoreset = array('profile','standalone','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback'); for ($i=0; $i - +?> + -wordpress > <?php echo $title; ?> - - +WordPress > <?php echo $title; ?> + + + @@ -105,8 +68,9 @@ setTimeout("redirect();", 600); //--> + + + + + + +
+ + + + + + + + + + + tabindex="4" class="checkbox" id="autobr" />
+ + + + + + + + + + + + +

+ + + +
+
+ + + + +
+ + + + + + + +
+ + + diff --git a/wp-admin/b2team.php b/wp-admin/b2team.php index 2039402ffd..e56861d9be 100644 --- a/wp-admin/b2team.php +++ b/wp-admin/b2team.php @@ -1,5 +1,5 @@ */ $b2varstoreset = array('action','standalone','redirect','profile'); @@ -20,79 +20,75 @@ for ($i=0; $i - - - - - -
Click on an user's login name to see his/her complete Profile.
- To edit your Profile, click on your login name.
- -
- -

Active users + +

Click on an user’s login name to see his complete profile.
+ To edit your profile, click on your login name.

+
+ +
+

Active users

@@ -106,7 +102,7 @@ default: 0 ORDER BY ID"; + $request = "SELECT * FROM $tableusers WHERE user_level>0 ORDER BY ID"; $result = mysql_query($request); while($row = mysql_fetch_object($result)) { $user_data = get_userdata2($row->ID); @@ -138,16 +134,16 @@ default: ?>
ID
-

- + +
+ -
- -

Inactive users (level 0) +

+

Inactive users (level 0)

@@ -191,17 +187,16 @@ default: ?>
ID
-

- +
= 3) { ?> -
- - To delete an user, bring his/her level to zero, then click on the red cross.
- Warning: deleting an user also deletes all posts made by this user. - +
+

To delete an user, bring his level to zero, then click on the red X.
+ Warning: deleting an user also deletes all posts made by this user. +

+
*/ -include("b2footer.php") ?> \ No newline at end of file +include('b2footer.php'); +?> \ No newline at end of file diff --git a/wp-admin/linkcategories.php b/wp-admin/linkcategories.php index 6649949034..e73cb40da2 100644 --- a/wp-admin/linkcategories.php +++ b/wp-admin/linkcategories.php @@ -101,8 +101,7 @@ switch ($action) { $cat_name=addslashes($cat_name); $auto_toggle=get_autotoggle($cat_id); ?> - - +

Old name:

@@ -114,7 +113,7 @@ switch ($action) {

- +
Ask for a promotion to your blog admin :)"); } ?> - - +
@@ -186,16 +184,13 @@ $result = mysql_query($query) or die("Couldn't execute query. ".mysql_error());
Link Categories:
- - +
- +
Note:
Deleting a link category does not delete links from that category.
It will just set them back to the default category . - - - +
- + diff --git a/wp-admin/linkmanager.php b/wp-admin/linkmanager.php index 0a88c6e63e..8af885fad2 100644 --- a/wp-admin/linkmanager.php +++ b/wp-admin/linkmanager.php @@ -30,7 +30,7 @@ include_once('../wp-links/links.config.php'); include_once("../wp-links/links.php"); -$title = "Manage Links"; +$title = 'Manage Links'; function add_magic_quotes($array) { foreach ($array as $k => $v) { @@ -69,13 +69,13 @@ for ($i=0; $iAsk for a promotion to your blog admin :)"); + die("You have no right to edit the links for this blog.
Ask for a promotion to your blog admin. :)"); } $sql = "SELECT link_url, link_name, link_image, link_target, link_description, link_visible, link_category AS cat_id, link_rating, link_rel " . @@ -215,8 +216,8 @@ switch ($action) { } ?> - - + +
@@ -293,7 +294,7 @@ switch ($action) {
- +
- - + +
@@ -396,9 +397,9 @@ switch ($action) {
Link Categories:Manage Link Categories
- - - +
+ +
@@ -480,10 +481,9 @@ switch ($action) { - - + - +
@@ -555,13 +555,17 @@ switch ($action) {
+
+
+

You can drag link this to your toolbar and when you click it a window will pop up that will allow you to add whatever site you're on to your links! Right now this only works on Mozilla or Netscape, but we're working on it.

+
- - + +