Ticket #10396: 10396_g.diff

File 10396_g.diff, 13.2 KB (added by dancole, 3 years ago)

Fixed errors in 10396_f.diff

Line 
1Index: wp-admin/includes/upgrade.php
2===================================================================
3--- wp-admin/includes/upgrade.php       (revision 13073)
4+++ wp-admin/includes/upgrade.php       (working copy)
5@@ -33,7 +33,7 @@
6  * @param null $deprecated Optional. Not used.
7  * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
8  */
9-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '' ) {
10+function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
11        global $wp_rewrite;
12 
13        if ( !empty( $deprecated ) )
14@@ -60,13 +60,15 @@
15        // Create default user.  If the user already exists, the user tables are
16        // being shared among blogs.  Just set the role in that case.
17        $user_id = username_exists($user_name);
18-       if ( !$user_id ) {
19-               $random_password = wp_generate_password();
20+       if ( !$user_id && $user_password == '' ) {
21+               $user_password = wp_generate_password();
22                $message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
23-               $user_id = wp_create_user($user_name, $random_password, $user_email);
24-               update_user_option($user_id, 'default_password_nag', true, true);
25+               $user_id = wp_create_user($user_name, $user_password, $user_email);
26+               update_usermeta($user_id, 'default_password_nag', true);
27+       } else if ( !$user_id ) {
28+               $message = __('<strong><em>Note that password</em></strong> carefully!');
29+               $user_id = wp_create_user($user_name, $user_password, $user_email);
30        } else {
31-               $random_password = '';
32                $message =  __('User already exists.  Password inherited.');
33        }
34 
35@@ -77,11 +79,11 @@
36 
37        $wp_rewrite->flush_rules();
38 
39-       wp_new_blog_notification($blog_title, $guessurl, $user_id, $random_password);
40+       wp_new_blog_notification($blog_title, $guessurl, $user_id, $user_password);
41 
42        wp_cache_flush();
43 
44-       return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password, 'password_message' => $message);
45+       return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
46 }
47 endif;
48 
49Index: wp-admin/css/install.css
50===================================================================
51--- wp-admin/css/install.css    (revision 13073)
52+++ wp-admin/css/install.css    (working copy)
53@@ -1 +1 @@
54-html{background:#f7f7f7;}body{background:#fff;color:#333;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;margin:2em auto 0 auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li{padding-bottom:2px;font-size:12px;line-height:18px;}code{font-size:13px;}ul,ol{padding:5px 5px 5px 22px;}#logo{margin:6px 0 14px 0;border-bottom:none;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:110px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code{font-family:Consolas,Monaco,Courier,monospace;}
55\ No newline at end of file
56+html{background:#f7f7f7;}body{background:#fff;color:#333;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;margin:2em auto 0 auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li{padding-bottom:2px;font-size:12px;line-height:18px;}code{font-size:13px;}ul,ol{padding:5px 5px 5px 22px;}#logo{margin:6px 0 14px 0;border-bottom:none;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:110px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code{font-family:Consolas,Monaco,Courier,monospace;}#pass-strength-result {background-color: #EEEEEE;border-color: #DDDDDD !important;border-style: solid;border-width: 1px;float: left;margin: 12px 5px 5px 1px;padding: 5px;text-align: center;width: 200px;}#pass-strength-result.bad {background-color: #FFB78C;border-color: #FF853C !important;}#pass-strength-result.good {background-color: #FFEC8B;border-color: #FFCC00 !important;}#pass-strength-result.short {background-color: #FFA0A0;border-color: #F04040 !important;}#pass-strength-result.strong {background-color: #C3FF88;border-color: #8DFF1C !important;}
57Index: wp-admin/css/install.dev.css
58===================================================================
59--- wp-admin/css/install.dev.css        (revision 13073)
60+++ wp-admin/css/install.dev.css        (working copy)
61@@ -131,3 +131,35 @@
62 }
63 
64 #error-page code { font-family: Consolas, Monaco, Courier, monospace; }
65+
66+#pass-strength-result {
67+       background-color: #EEEEEE;
68+       border-color: #DDDDDD !important;
69+       border-style: solid;
70+       border-width: 1px;
71+       float: left;
72+       margin: 12px 5px 5px 1px;
73+       padding: 5px;
74+       text-align: center;
75+       width: 200px;
76+}
77+
78+#pass-strength-result.bad {
79+       background-color: #FFB78C;
80+       border-color: #FF853C !important;
81+}
82+
83+#pass-strength-result.good {
84+       background-color: #FFEC8B;
85+       border-color: #FFCC00 !important;
86+}
87+
88+#pass-strength-result.short {
89+       background-color: #FFA0A0;
90+       border-color: #F04040 !important;
91+}
92+
93+#pass-strength-result.strong {
94+       background-color: #C3FF88;
95+       border-color: #8DFF1C !important;
96+}
97Index: wp-admin/install.php
98===================================================================
99--- wp-admin/install.php        (revision 13073)
100+++ wp-admin/install.php        (working copy)
101@@ -20,6 +20,9 @@
102 /** Load WordPress Administration Upgrade API */
103 require_once(dirname(__FILE__) . '/includes/upgrade.php');
104 
105+/** Load wpdb */
106+require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php');
107+
108 if (isset($_GET['step']))
109        $step = $_GET['step'];
110 else
111@@ -49,6 +52,9 @@
112 }//end function display_header();
113 
114 function display_setup_form( $error = null ) {
115+       global $wpdb;
116+       $user_table = ( $wpdb->get_var("SHOW TABLES LIKE '$table_name'") != null ) ? true : false;
117+
118        // Ensure that Blogs appear in search engines by default
119        $blog_public = 1;
120        if ( isset($_POST) && !empty($_POST) ) {
121@@ -66,6 +72,26 @@
122                        <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo ( isset($_POST['weblog_title']) ? esc_attr($_POST['weblog_title']) : '' ); ?>" /></td>
123                </tr>
124                <tr>
125+                       <th scope="row"><label for="user_name"><?php _e('User Name'); ?></label></th>
126+                       <td>
127+                       <?php if ( $user_table ) { _e('User(s) already exists.'); } else { ?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo ( isset($_POST['user_name']) ? esc_attr($_POST['user_name']) : 'admin' ); ?>" /><?php } ?>
128+                       </td>
129+               </tr>
130+               <tr>
131+                       <th scope="row"><label for="admin_password"><?php _e('Password'); ?></label></th>
132+                       <td>
133+                               <?php if ( $user_table ) {
134+                                       _e('No user is being created, so no new password is needed.');
135+                               }
136+                               else {
137+                                       ?><input name="admin_password" type="password" id="pass1" size="25" value="<?php echo ( isset($_POST['admin_password']) ? esc_attr($_POST['admin_password']) : '' ); ?>" />
138+                                       <br /><?php _e('A password will be automatically generated for you if this field is blank.'); ?>
139+                                       <br /><div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
140+                                       <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p><?php
141+                               } ?>
142+                       </td>
143+               </tr>
144+               <tr>
145                        <th scope="row"><label for="admin_email"><?php _e('Your E-mail'); ?></label></th>
146                        <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo ( isset($_POST['admin_email']) ? esc_attr($_POST['admin_email']) : '' ); ?>" /><br />
147                        <?php _e('Double-check your email address before continuing.'); ?></td>
148@@ -123,15 +149,21 @@
149                display_header();
150                // Fill in the data we gathered
151                $weblog_title = isset($_POST['weblog_title']) ? stripslashes($_POST['weblog_title']) : '';
152+               $user_name = isset($_POST['user_name']) ? stripslashes($_POST['user_name']) : '';
153+               $admin_password = isset($_POST['admin_password']) ? stripslashes($_POST['admin_password']) : '';
154                $admin_email = isset($_POST['admin_email']) ? stripslashes($_POST['admin_email']) : '';
155                $public = isset($_POST['blog_public']) ? (int) $_POST['blog_public'] : 0;
156                // check e-mail address
157                $error = false;
158-               if (empty($admin_email)) {
159+               if ( empty( $user_name ) ) {
160                        // TODO: poka-yoke
161+                       display_setup_form( __('you must provide a valid user name.') );
162+                       $error = true;
163+               } else if ( empty( $admin_email ) ) {
164+                       // TODO: poka-yoke
165                        display_setup_form( __('you must provide an e-mail address.') );
166                        $error = true;
167-               } else if (!is_email($admin_email)) {
168+               } else if ( !is_email( $admin_email ) ) {
169                        // TODO: poka-yoke
170                        display_setup_form( __('that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>') );
171                        $error = true;
172@@ -139,7 +171,7 @@
173 
174                if ( $error === false ) {
175                        $wpdb->show_errors();
176-                       $result = wp_install($weblog_title, 'admin', $admin_email, $public);
177+                       $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
178                        extract($result, EXTR_SKIP);
179 ?>
180 
181@@ -150,12 +182,12 @@
182 <table class="form-table">
183        <tr>
184                <th><?php _e('Username'); ?></th>
185-               <td><code>admin</code></td>
186+               <td><code><?php echo esc_html($user_name); ?></code></td>
187        </tr>
188        <tr>
189                <th><?php _e('Password'); ?></th>
190                <td><?php if ( !empty( $password ) ) {
191-                                               echo '<code>'. $password .'</code><br />';
192+                                               echo '<code>'. esc_html($password) .'</code><br />';
193                                        }
194                                        echo '<p>'. $password_message .'</p>'; ?></td>
195        </tr>
196@@ -169,5 +201,22 @@
197 }
198 ?>
199 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
200+<script type="text/javascript" src="../wp-includes/js/jquery/jquery.js"></script>
201+<script type="text/javascript" src="js/password-strength-meter.js"></script>
202+<script type="text/javascript" src="js/user-profile.js"></script>
203+<script type="text/javascript" src="js/utils.js"></script>
204+<script type='text/javascript'>
205+/* <![CDATA[ */
206+try{convertEntities(commonL10n);}catch(e){};
207+var pwsL10n = {
208+ empty: "Strength indicator",
209+ short: "Very weak",
210+ bad: "Weak",
211+ good: "Medium",
212+ strong: "Strong"
213+};
214+try{convertEntities(pwsL10n);}catch(e){};
215+/* ]]> */
216+</script>
217 </body>
218 </html>