Changeset 1251
- Timestamp:
- 10/25/07 02:12:12 (10 months ago)
- Files:
-
- branches/1.0/src/config/wp-config-sample.php (modified) (1 diff)
- branches/1.0/src/lib/functions.php (modified) (1 diff)
- branches/1.0/src/lib/lyceum-registration-functions.php (modified) (1 diff)
- branches/1.0/src/lyceum/system-admin/settings.php (modified) (1 diff)
- branches/1.0/src/lyceum/wp-admin/upgrade-schema.php (modified) (1 diff)
- branches/1.0/src/lyceum/wp-includes/pluggable-functions.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0/src/config/wp-config-sample.php
r1231 r1251 9 9 $table_prefix = ''; // Only numbers, letters, and underscores please! 10 10 11 12 define('PROTOCOL', 'http://'); 11 13 // The web path to the base of lyceum (where portal.php is sitting), with NO TRAILING SLASH 12 14 // Something like '' or '/lyceum' or '/src/lyceum' branches/1.0/src/lib/functions.php
r1249 r1251 309 309 } 310 310 311 function slug_from_blog_id($blog_id){ 312 global $wpdb; 313 return $wpdb->get_var("SELECT slug FROM blogs WHERE id = '$blog_id'"); 314 } 315 316 function url_from_blog_id($blog_id){ 317 $slug = slug_from_blog_id($blog_id); 318 return 319 PROTOCOL . 320 ( SUBDOMAINS ? $slug . '.' : '' ) . 321 MAINDOMAIN . '/' . 322 ( SUBDOMAINS ? '' : $slug . '/' ); 323 } 324 311 325 function delete_blog($blog){ 312 326 global $wpdb; branches/1.0/src/lib/lyceum-registration-functions.php
r1250 r1251 106 106 $wp_rewrite->flush_rules(); 107 107 108 lyceum_new_blog_notification($blog, $userid); 109 108 110 return $blog; 109 111 } 112 113 function lyceum_new_blog_notification($blog_id, $user_id) { 114 global $wpdb; 115 116 $user = new WP_User($user_id); 117 118 $user_login = stripslashes($user->user_login); 119 $user_email = stripslashes($user->user_email); 120 trace('$blog_id', $blog_id); 121 trace('url_from_blog_id($blog_id)', url_from_blog_id($blog_id)); 122 $message = sprintf(__('New blog created on %s: '), get_settings('site_title')) . "\r\n"; 123 $message .= sprintf(__('Blog: %s'), url_from_blog_id($blog_id)) . "\r\n"; 124 $message .= sprintf(__('Created by: %s (%s)'), $user_login, $user_email) . "\r\n\r\n\r\n"; 125 126 @wp_mail(get_settings('system_admin_email'), sprintf(__('[%s] New Blog Created'), get_settings('site_title')), $message); 127 128 $message .= get_settings('new_blog_welcome_message'); 129 130 wp_mail($user_email, sprintf(__('[%s] New Blog Created'), get_settings('site_title')), $message); 131 } 132 133 110 134 ?> branches/1.0/src/lyceum/system-admin/settings.php
r1250 r1251 307 307 308 308 <form method="post" action="setoption.php" class="lyceum_form"> 309 <?php echo tokeninput('setoption.php', 'new_user_welcome_message')?> 310 <input type="hidden" name="option" value="new_user_welcome_message" /> 311 312 <table class="FormTable"> 313 <col width="20%" /> 314 <col width="80%" /> 315 316 <tbody> 317 <tr> 318 <th scope="row"><label for="new_user_welcome_message">New user welcome message</label></th> 319 <td> 320 <textarea name="value" cols="60" rows="5" id="new_user_welcome_message" class="TextArea"><?php echo get_option('new_user_welcome_message') ?></textarea> 321 <input type="submit" value="Submit" name="submit" class="Button" /> 322 <div class="HelpText">The message that will be emailed to a user upon account creation. If a user simultaneously registers and creates a blog, they will get both this message and the one below.</div> 323 </td> 324 </tr> 325 </tbody> 326 </table> 327 </form> 328 329 <form method="post" action="setoption.php" class="lyceum_form"> 330 <?php echo tokeninput('setoption.php', 'new_blog_welcome_message')?> 331 <input type="hidden" name="option" value="new_blog_welcome_message" /> 332 333 <table class="FormTable"> 334 <col width="20%" /> 335 <col width="80%" /> 336 337 <tbody> 338 <tr> 339 <th scope="row"><label for="new_blog_welcome_message">New blog welcome message</label></th> 340 <td> 341 <textarea name="value" cols="60" rows="5" id="new_blog_welcome_message" class="TextArea"><?php echo get_option('new_blog_welcome_message') ?></textarea> 342 <input type="submit" value="Submit" name="submit" class="Button" /> 343 <div class="HelpText">The message that will be emailed to a user upon creation of a blog.</div> 344 </td> 345 </tr> 346 </tbody> 347 </table> 348 </form> 349 350 <form method="post" action="setoption.php" class="lyceum_form"> 309 351 <?php echo tokeninput('setoption.php', 'create_example_post')?> 310 352 <input type="hidden" name="option" value="create_example_post" /> branches/1.0/src/lyceum/wp-admin/upgrade-schema.php
r1250 r1251 343 343 add_option('example_post_title', 'Hello world!'); 344 344 add_option('example_page_title', 'About page example -- edit me!'); 345 add_option('new_user_welcome_message', 'About page example -- edit me!'); 346 add_option('new_blog_welcome_message', 'About page example -- edit me!'); 345 347 346 348 //// this is a little ugly branches/1.0/src/lyceum/wp-includes/pluggable-functions.php
r1097 r1251 477 477 $message = sprintf(__('Username: %s'), $user_login) . "\r\n"; 478 478 $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n"; 479 $message .= LURL . "/login\r\n"; 479 $message .= LURL . "/login\r\n\r\n"; 480 $message .= get_settings('new_user_welcome_message'); 480 481 481 482 wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_settings('site_title')), $message);
