Adding Plugins

Updating the following
akismet.4.1.2, google-authenticator.0.52, jetpack.7.3.1

Signed-off-by: Yury German <blueknight@gentoo.org>

6 files changed, 124 insertions, 0 deletions

diff --git a/plugins/jetpack/views/admin/must-connect-main-blog.php b/plugins/jetpack/views/admin/must-connect-main-blog.php
new file mode 100644
index 00000000..decf72bd
--- /dev/null
+++ b/plugins/jetpack/views/admin/must-connect-main-blog.php
@@ -0,0 +1,16 @@
+<div class="wrap">
+	<div class="jetpack-wrap-container dops-card">
+		<div class="jetpack-text-container">
+			<h1><?php esc_html_e( 'Get started with Jetpack Multisite', 'jetpack' ); ?></h1>
+			<p>
+				<?php esc_html_e( 'Get started managing your Multisite install of Jetpack by connecting.', 'jetpack' ); ?>
+			</p>
+		</div>
+		<div class="jetpack-install-container">
+			<p class="submit"><a href="<?php echo esc_url( $data['url'] ); ?>" class="button-connector dops-button is-primary" id="wpcom-connect"><?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?></a></p>
+			<p class="jetpack-install-blurb">
+				<?php jetpack_render_tos_blurb(); ?>
+			</p>
+		</div>
+	</div>
+</div>
diff --git a/plugins/jetpack/views/admin/network-activated-notice.php b/plugins/jetpack/views/admin/network-activated-notice.php
new file mode 100644
index 00000000..93809035
--- /dev/null
+++ b/plugins/jetpack/views/admin/network-activated-notice.php
@@ -0,0 +1,5 @@
+<?php if ( isset( $_GET['jetpack-notice'] ) && 'dismiss' == $_GET['jetpack-notice'] ) : ?>
+	<div id="message" class="error">
+		<p><?php _e( 'Jetpack is network activated and notices can not be dismissed.', 'jetpack' ); ?></p>
+	</div>
+<?php endif; ?>
diff --git a/plugins/jetpack/views/admin/network-admin-alert.php b/plugins/jetpack/views/admin/network-admin-alert.php
new file mode 100644
index 00000000..434b80f1
--- /dev/null
+++ b/plugins/jetpack/views/admin/network-admin-alert.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */
\ No newline at end of file
diff --git a/plugins/jetpack/views/admin/network-admin-footer.php b/plugins/jetpack/views/admin/network-admin-footer.php
new file mode 100644
index 00000000..434b80f1
--- /dev/null
+++ b/plugins/jetpack/views/admin/network-admin-footer.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */
\ No newline at end of file
diff --git a/plugins/jetpack/views/admin/network-admin-header.php b/plugins/jetpack/views/admin/network-admin-header.php
new file mode 100644
index 00000000..2bbe4cf9
--- /dev/null
+++ b/plugins/jetpack/views/admin/network-admin-header.php
@@ -0,0 +1,4 @@
+<?php
+	Jetpack::init()->load_view( 'admin/network-activated-notice.php' );
+	/** This action is already documented in views/admin/admin-page.php */
+	do_action( 'jetpack_notices' );
diff --git a/plugins/jetpack/views/admin/network-settings.php b/plugins/jetpack/views/admin/network-settings.php
new file mode 100644
index 00000000..00d23ba4
--- /dev/null
+++ b/plugins/jetpack/views/admin/network-settings.php
@@ -0,0 +1,87 @@
+<?php extract( $data ); ?>
+
+<?php if ( isset( $_GET['updated'] ) && 'true' == $_GET['updated'] ) : ?>
+	<div class="updated"><p><?php esc_html_e( 'Jetpack Network Settings Updated!', 'jetpack' ); ?></p></div>
+<?php endif; ?>
+
+<?php if ( isset( $_GET['error'] ) && 'jetpack_protect_whitelist' == $_GET['error'] ) : ?>
+	<div class="error"><p><?php esc_html_e( 'One of your IP addresses was not valid.', 'jetpack' ); ?></p></div>
+<?php endif; ?>
+
+<div class="wrap">
+	<h2><?php _e( 'Network Settings', 'jetpack' ); ?></h2>
+	<form action="edit.php?action=jetpack-network-settings" method="POST">
+		<h3><?php _ex( 'Global', 'Affects all sites in a Multisite network.', 'jetpack' ); ?></h3>
+		<p><?php _e( 'These settings affect all sites on the network.', 'jetpack' ); ?></p>
+		<?php wp_nonce_field( 'jetpack-network-settings' ); ?>
+		<table class="form-table">
+<?php /*
+			<tr valign="top">
+				<th scope="row"><label for="auto-connect">Auto-Connect New Sites</label></th>
+				<td>
+					<input type="checkbox" name="auto-connect" id="auto-connect" value="1" <?php checked($options['auto-connect']); ?> />
+					<label for="auto-connect">Automagically connect all new sites in the network.</label>
+				</td>
+			</tr>
+/**/ ?>
+			<tr valign="top">
+				<th scope="row"><label for="sub-site-override"><?php _e( 'Sub-site override', 'jetpack' ); ?></label></th>
+				<td>
+					<input type="checkbox" name="sub-site-connection-override" id="sub-site-override" value="1" <?php checked($options['sub-site-connection-override']); ?> />
+					<label for="sub-site-override"><?php _e( 'Allow individual site administrators to manage their own connections (connect and disconnect) to <a href="//wordpress.com">WordPress.com</a>', 'jetpack' ); ?></label>
+				</td>
+			</tr>
+
+			<tr valign="top">
+				<th scope="row"><label for="sub-site-override"><?php _e( 'Protect whitelist', 'jetpack' ); ?></label></th>
+				<td>
+					<p><strong><?php printf( __( 'Your current IP: %s', 'jetpack' ), jetpack_protect_get_ip() ); ?></strong></p>
+					<textarea name="global-whitelist" style="width: 100%;" rows="8"><?php echo implode( PHP_EOL, $jetpack_protect_whitelist['global'] ); ?></textarea> <br />
+					<label for="global-whitelist"><?php _e('IPv4 and IPv6 are acceptable. Enter multiple IPs on separate lines. <br />To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1-12.12.12.100', 'jetpack' ); ?></label>
+				</td>
+			</tr>
+<?php /* Remove the toggles for 2.9, re-evaluate how they're done and added for a 3.0 release. They don't feel quite right yet.
+			<tr>
+				<th scope="row"><label for="manage_auto_activated_modules">Manage modules</label></th>
+				<td>
+					<input type="checkbox" name="manage_auto_activated_modules" id="manage_auto_activated_modules" onclick="jQuery('#jpms_settings_modules').toggle();" value="1" <?php checked( $options['manage_auto_activated_modules'] ); ?>/>
+					<label for="manage_auto_activated_modules">Control which modules are auto-activated</label>
+				</td>
+			</tr>
+/**/ ?>
+		</table>
+
+<?php /* Remove the toggles for 2.9, re-evaluate how they're done and added for a 3.0 release. They don't feel quite right yet.
+		<?php
+			$display_modules = ( 1 == $this->get_option( 'manage_auto_activated_modules' ) )? 'block': 'none';
+		?>
+		<div id="jpms_settings_modules" style="display: <?php echo $display_modules; ?>">
+		<h3><?php _e( 'Modules', 'jetpack' ); ?></h3>
+		<p><?php _e( 'Modules to be automatically activated when new sites are created.', 'jetpack' ); ?></p>
+		<table>
+			<thead>
+								<!--
+				<tr>
+					<td><input type="checkbox"></td>
+					<td>Only show checked modules on subsites?</td>
+				</tr>
+				-->
+			</thead>
+			<tbody>
+
+				<?php foreach( $modules AS $module ) {  ?>
+				<tr>
+					<td><input type="checkbox" name="modules[]" value="<?php echo $module['module']; ?>" id="<?php echo $module['module']; ?>" <?php checked( in_array( $module['module'], $options['modules'] ) ); ?>/></td>
+					<td><label for="<?php echo $module['module']; ?>"><?php echo $module['name']; ?></label></td>
+				</tr>
+
+				<?php } ?>
+			</tbody>
+		</table>
+		</div>
+/**/ ?>
+
+		<?php submit_button(); ?>
+
+	</form>
+</div>