WordPress.org
Get WordPress

Make WordPress Core

Changeset 40


Ignore:
Timestamp:
05/22/2003 10:51:40 PM (22 years ago)
Author:
mikelittle
Message:

More changes for new admin path. Removed relocated files.
Moved some more files from b2-include to wp-admin.

Location:
trunk
Files:
3 added
33 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/b2-include/b2vars.php

    r15 r40  
    131131$tabletop = "\t<table cellspacing=\"0\" cellpadding=\"1\" width=\"85%\" border=\"0\" bgcolor=\"#cccccc\" align=\"center\">\n\t<td align=\"left\">\n\t\t<table cellspacing=\"0\" cellpadding=\"15\" width=\"100%\" border=\"0\"bgcolor=\"#ffffff\" align=\"center\">\n\t\t<td align=\"left\">\n";
    132132$tablebottom = "\t\t</td>\n\t</table>\n\t</td>\n\t</table>\n";
    133 $blankline = '<img src="b2-img/blank.gif" width="10" height="5" border="0" /><br />';
     133$blankline = '<img src="../b2-img/blank.gif" width="10" height="5" border="0" /><br />';
    134134
    135135# on which page are we ?

  • trunk/b2config.php

    r39 r40  
    66
    77
    8 # Reminder: everything that starts with #, /* or // is a comment
     8// Reminder: everything that starts with #, /* or // is a comment
    99
    1010/* Start editing */
    1111
    12 # $siteurl is your blog's URL: for example, 'http://mydomain.com' (no trailing slash !)
    13 # $blogfilename is the name of the default file for your blog
    14 # $blogname is the name of your blog
     12// $siteurl is your blog's URL: for example, 'http://mydomain.com' (no trailing slash !)
     13// $blogfilename is the name of the default file for your blog
     14// $blogname is the name of your blog
    1515
    1616$siteurl = 'http://example.com';
    … …  
    2121
    2222
    23 # $pathserver is where you have uploaded b2: for example, 'http://mydomain.com' (no ending slash !)
    24 #   by default b2 is set to run in the folder your blog resides, same as $siteurl
     23// $pathserver is where you have uploaded b2: for example, 'http://mydomain.com' (no ending slash !)
     24//   by default b2 is set to run in the folder your blog resides, same as $siteurl
    2525
    2626$pathserver = 'http://example.com';
    2727
    2828
    29 # your email (obvious eh ?)
     29// your email (obvious eh ?)
    3030$admin_email = 'you@example.com';
    3131
    3232
    33 # set this to 0 or 1, whether you want new users to be able to post entries once they registered
     33// set this to 0 or 1, whether you want new users to be able to post entries once they registered
    3434$new_users_can_blog = 0;
    3535
    3636
    37 # set this to 0 or 1, whether you want to allow users to register on your blog.     
     37// set this to 0 or 1, whether you want to allow users to register on your blog.     
    3838$users_can_register = 1;
    3939
    4040
    41 # day at the start of the week: 0 for Sunday, 1 for Monday, 2 for Tuesday, etc
     41// day at the start of the week: 0 for Sunday, 1 for Monday, 2 for Tuesday, etc
    4242$start_of_week = 1;
    4343
    … …  
    4646// ** MySQL settings **
    4747
    48 # fill with your database details
     48// fill with your database details
    4949$dbname = 'b2';         // the name of the database
    5050$dbusername = 'user';           // your MySQL username
    … …  
    5252$dbhost = 'localhost';      // 99% chances you won't need to change this value
    5353
    54 # database tables' names (change them if you want to have multiple b2's in a single database)
     54// database tables' names (change them if you want to have multiple b2's in a single database)
    5555$tableposts = 'b2posts';
    5656$tableusers = 'b2users';
    … …  
    6262// ** Post preview function **
    6363
    64 # set this to 1 if you want to use the 'preview' function
     64// set this to 1 if you want to use the 'preview' function
    6565$use_preview = 1;
    6666
    … …  
    7070
    7171
    72 # set this to 0 to disable the spell checker, or 1 to enable it
     72// set this to 0 to disable the spell checker, or 1 to enable it
    7373$use_spellchecker = 0;
    7474
    … …  
    7777// ** Text formatting options **
    7878
    79 # these options can help you format your text without using too much html
     79// these options can help you format your text without using too much html
    8080$use_bbcode = 0;    // use BBCode, like [b]bold[/b]
    8181$use_gmcode = 0;    // use GreyMatter-styles: **bold** \italic\ __underline__
    8282$use_quicktags = 1; // buttons for HTML tags (they won't work on IE Mac yet)
    8383
    84 # IMPORTANT! set this to 0 if you are using Chinese, Japanese, Korean,
    85 #                                           or other double-bytes languages
     84// IMPORTANT! set this to 0 if you are using Chinese, Japanese, Korean,
     85//                                           or other double-bytes languages
    8686$use_htmltrans = 1;
    8787
    88 # this could help balance your HTML code. if it gives bad results, set it to 0
     88// this could help balance your HTML code. if it gives bad results, set it to 0
    8989$use_balanceTags = 1;
    9090
    … …  
    9393
    9494
    95 # set this to 0 to disable file upload, or 1 to enable it
    96 $use_fileupload = 0;
    97 
    98 # enter the real path of the directory where you'll upload the pictures
    99 #   if you're unsure about what your real path is, please ask your host's support staff
    100 #   note that the  directory must be writable by the webserver (ChMod 766)
    101 #   note for windows-servers users: use forwardslashes instead of backslashes
    102 #$fileupload_realpath = '/home/your/site/b2/images';
     95// set this to 0 to disable file upload, or 1 to enable it
     96$use_fileupload = 1;
     97
     98// enter the real path of the directory where you'll upload the pictures
     99//   if you're unsure about what your real path is, please ask your host's support staff
     100//   note that the  directory must be writable by the webserver (ChMod 766)
     101//   note for windows-servers users: use forwardslashes instead of backslashes
     102//$fileupload_realpath = '/home/your/site/b2/images';
    103103$fileupload_realpath = '/home/example/public_html/images';
    104104
    105 # enter the URL of that directory (it's used to generate the links to the pictures)
     105// enter the URL of that directory (it's used to generate the links to the pictures)
    106106$fileupload_url = 'http://example.com/images';
    107107
    108 # accepted file types, you can add to that list if you want
    109 #   note: add a space before and after each file type
    110 #   example: $fileupload_allowedtypes = ' jpg gif png ';
     108// accepted file types, you can add to that list if you want
     109//   note: add a space before and after each file type
     110//   example: $fileupload_allowedtypes = ' jpg gif png ';
    111111$fileupload_allowedtypes = ' jpg gif png ';
    112112
    113 # by default, most servers limit the size of uploads to 2048 KB
    114 #   if you want to set it to a lower value, here it is (you cannot set a higher value)
     113// by default, most servers limit the size of uploads to 2048 KB
     114//   if you want to set it to a lower value, here it is (you cannot set a higher value)
    115115$fileupload_maxk = '96';
    116116
    117 # you may not want all users to upload pictures/files, so you can set a minimum level for this
     117// you may not want all users to upload pictures/files, so you can set a minimum level for this
    118118$fileupload_minlevel = '1';
    119119
    120 # ...or you may authorize only some users. enter their logins here, separated by spaces
    121 #   if you leave that variable blank, all users who have the minimum level are authorized to upload
    122 #   note: add a space before and after each login name
    123 #   example: $fileupload_allowedusers = ' barbara anne ';
     120// ...or you may authorize only some users. enter their logins here, separated by spaces
     121//   if you leave that variable blank, all users who have the minimum level are authorized to upload
     122//   note: add a space before and after each login name
     123//   example: $fileupload_allowedusers = ' barbara anne ';
    124124$fileupload_allowedusers = '';
    125125
    … …  
    128128// ** RSS syndication options **
    129129
    130 # these options are used by b2rdf.php (1.0), b2rss.php (0.92), and b2rss2.php (2.0)
    131 #  note: if you don't want to syndicate your news, you can delete these files
    132 
    133 # number of last posts to syndicate
     130// these options are used by b2rdf.php (1.0), b2rss.php (0.92), and b2rss2.php (2.0)
     131//  note: if you don't want to syndicate your news, you can delete these files
     132
     133// number of last posts to syndicate
    134134$posts_per_rss = 10;
    135135
    136 # the language of your blog ( see this: http://backend.userland.com/stories/storyReader$16 )
     136// the language of your blog ( see this: http://backend.userland.com/stories/storyReader$16 )
    137137$rss_language = 'en';
    138138
    139 # for b2rss.php: allow encoded HTML in <description> tag? 1=yes, 0=no
     139// for b2rss.php: allow encoded HTML in <description> tag? 1=yes, 0=no
    140140$rss_encoded_html = 0;
    141141
    142 # length (in words) of excerpts in the RSS feed? 0=unlimited
    143 #  note: in b2rss.php, this will be set to 0 if you use encoded HTML
     142// length (in words) of excerpts in the RSS feed? 0=unlimited
     143//  note: in b2rss.php, this will be set to 0 if you use encoded HTML
    144144$rss_excerpt_length = 50;
    145 #use the excerpt field for rss feed.
     145//use the excerpt field for rss feed.
    146146$rss_use_excerpt = 1;
    147147
    … …  
    149149// ** Weblogs.com ping **
    150150
    151 # set this to 1 if you want your site to be listed on http://weblogs.com when you add a new post
     151// set this to 1 if you want your site to be listed on http://weblogs.com when you add a new post
    152152$use_weblogsping = 0;
    153153
    … …  
    155155// ** Blo.gs ping **
    156156
    157 # set this to 1 if you want your site to be listed on http://blo.gs when you add a new post
     157// set this to 1 if you want your site to be listed on http://blo.gs when you add a new post
    158158$use_blodotgsping = 0;
    159159
    160 # if you ping blo.gs, this is the URL that will be sent to it (enter your blog's URL):
     160// if you ping blo.gs, this is the URL that will be sent to it (enter your blog's URL):
    161161$blodotgsping_url = 'http://example.com';
    162162
    … …  
    165165// ** Trackback / PingBack **
    166166
    167 # set this to 0 or 1, whether you want to allow your posts to be trackback'able or not
    168 # note: setting it to zero would also disable sending trackbacks
     167// set this to 0 or 1, whether you want to allow your posts to be trackback'able or not
     168// note: setting it to zero would also disable sending trackbacks
    169169$use_trackback = 1;
    170170
    171 # set this to 0 or 1, whether you want to allow your posts to be pingback'able or not
    172 # note: setting it to zero would also disable sending pingbacks
     171// set this to 0 or 1, whether you want to allow your posts to be pingback'able or not
     172// note: setting it to zero would also disable sending pingbacks
    173173$use_pingback = 1;
    174174
    … …  
    177177// ** Comments options **
    178178
    179 # set this to 1 to require e-mail and name, or 0 to allow comments without e-mail/name
     179// set this to 1 to require e-mail and name, or 0 to allow comments without e-mail/name
    180180$require_name_email = 0;
    181181
    182 # here is a list of the tags that are allowed in the comments.
    183 #  you can add tags to the list, just add them in the string,
    184 #  add only the opening tag: for example, only '<a>' instead of '<a href=""></a>'
     182// here is a list of the tags that are allowed in the comments.
     183//  you can add tags to the list, just add them in the string,
     184//  add only the opening tag: for example, only '<a>' instead of '<a href=""></a>'
    185185
    186186$comment_allowed_tags = '<b><i><u><strong><em><code><blockquote><p><br><strike><a>';
    187187
    188 # set this to 1 to let every author be notified about comments on their posts
     188// set this to 1 to let every author be notified about comments on their posts
    189189$comments_notify = 1;
    190190
    … …  
    193193// ** Smilies options **
    194194
    195 # set this to 1 to enable smiley conversion in posts
    196 #     (note: this makes smiley conversion in ALL posts)
     195// set this to 1 to enable smiley conversion in posts
     196//     (note: this makes smiley conversion in ALL posts)
    197197$use_smilies = 0;
    198198
    199 # the directory where your smilies are (no trailing slash)
     199// the directory where your smilies are (no trailing slash)
    200200$smilies_directory = 'http://example.com/b2-img/smilies';
    201201
    202 # here's the conversion table, you can modify it if you know what you're doing
     202// here's the conversion table, you can modify it if you know what you're doing
    203203$b2smiliestrans = array(
    204204    ':)'        => 'icon_smile.gif',
    … …  
    250250
    251251
    252 # the weekdays and the months.. translate them if necessary
     252// the weekdays and the months.. translate them if necessary
    253253
    254254$weekday[0]='Sunday';
    … …  
    261261
    262262
    263 # the months, translate them if necessary - note: this isn't active everywhere yet
     263// the months, translate them if necessary - note: this isn't active everywhere yet
    264264$month['01']='January';
    265265$month['02']='February';
    … …  
    277277
    278278
    279 # $b2inc is where the included b2 files are: that's generally the directory b2-include,
    280 #  so you shouldn't have to change that setting
     279// $b2inc is where the included b2 files are: that's generally the directory b2-include,
     280//  so you shouldn't have to change that setting
    281281$b2inc = 'b2-include';
    282282
    … …  
    293293// ** Configuration for b2mail.php ** (skip this if you don't intend to blog via email)
    294294
    295 # mailserver settings
     295// mailserver settings
    296296$mailserver_url = 'mail.example.com';
    297297$mailserver_login = 'login@example.com';
    … …  
    299299$mailserver_port = 110;
    300300
    301 # by default posts will have this category
     301// by default posts will have this category
    302302$default_category = 1;
    303303
    304 # subject prefix
     304// subject prefix
    305305$subjectprefix = 'blog:';
    306306
    307 # body terminator string (starting from this string, everything will be ignored, including this string)
     307// body terminator string (starting from this string, everything will be ignored, including this string)
    308308$bodyterminator = "___";
    309309
    310 # set this to 1 to run in test mode
     310// set this to 1 to run in test mode
    311311$thisisforfunonly = 0;
    312312
    313313
    314 ### Special Configuration for some phone email services
    315 
    316 # some mobile phone email services will send identical subject & content on the same line
    317 # if you use such a service, set $use_phoneemail to 1, and indicate a separator string
    318 # when you compose your message, you'll type your subject then the separator string
    319 # then you type your login:password, then the separator, then content
     314////// Special Configuration for some phone email services
     315
     316// some mobile phone email services will send identical subject & content on the same line
     317// if you use such a service, set $use_phoneemail to 1, and indicate a separator string
     318// when you compose your message, you'll type your subject then the separator string
     319// then you type your login:password, then the separator, then content
    320320
    321321$use_phoneemail = 0;
    … …  
    340340
    341341// This is so the new admin location works
    342 ini_set('include_path', ".:../:../$b2inc");
     342// Set this path separator appropriately for your OS: semi-colon on windows, colon on unix
     343//$path_sep=';';
     344$path_sep=':';
     345ini_set('include_path', '.'.$path_sep.'..'.$path_sep."../$b2inc".$path_sep."./$b2inc");
    343346
    344347?>

  • trunk/b2login.php

    r3 r40  
    296296        header("Cache-Control: no-cache, must-revalidate"); /* to cope with HTTP/1.1 */
    297297        header("Pragma: no-cache");
    298         header("Location: b2edit.php");
     298        header("Location: wp-admin/b2edit.php");
    299299        exit();
    300300    }
    … …  
    353353<input type="hidden" name="popuptitle" value="<?php echo $popuptitle ?>" />
    354354<?php } ?>
    355 <input type="hidden" name="redirect_to" value="b2edit.php" />
     355<input type="hidden" name="redirect_to" value="wp-admin/b2edit.php" />
    356356<input type="hidden" name="action" value="login" />
    357357<table width="100" style="background-color: #ffffff">

  • trunk/wp-admin/b2header.php

    r38 r40  
    33require_once("../b2config.php");
    44require_once($b2inc."/b2template.functions.php");
    5 require_once($b2inc."/b2verifauth.php");
     5require_once("b2verifauth.php");
    66require_once($b2inc."/b2vars.php");
    77require_once($b2inc."/b2functions.php");

  • trunk/wp-admin/b2menutop.php

    r38 r40  
    88if ($pagenow != "b2profile.php") {
    99
    10 $menu = file("b2menutop.txt");
     10$menu = file("./b2menutop.txt");
    1111$i=0;
    1212$j=$menu[0];

  • trunk/wp-admin/b2profile.php

    r38 r40  
    4444case "update":
    4545   
    46     require_once("$b2inc/b2verifauth.php");
     46    require_once("b2verifauth.php");
    4747
    4848    get_currentuserinfo();
    … …  
    115115case "viewprofile":
    116116
    117     require_once("$b2inc/b2verifauth.php");
     117    require_once("b2verifauth.php");
    118118/*  $profile=1;
    119119

  • trunk/wp-admin/b2template.php

    r38 r40  
    11<?php
    2 $title = "Template(s) & file editing";
     2$title = "Template(s) &amp; file editing";
    33/* <Template> */
    44

  • trunk/wp-admin/linkcategories.php

    r38 r40  
    7474    $standalone = 1;
    7575    include_once("./b2header.php");
    76     include_once("./links.php");
    7776
    7877    $cat_id = $HTTP_POST_VARS["cat_id"];
    … …  
    9897  {
    9998    include_once ("./b2header.php");
    100     include_once("./links.php");
    10199    $cat_id = $HTTP_POST_VARS["cat_id"];
    102100    $cat_name=get_linkcatname($cat_id);
Note: See TracChangeset for help on using the changeset viewer.