updated wptouch to 1.9.34

wp-content/plugins/wptouch/admin-css/bnc-global.css

+/* @override http://beta.bravenewcode.com/wordpress/wp-content/plugins/wptouch/admin-css/bnc-global.css */
+
 /* Global styles applied to BraveNewCode plugins */
 
 /* @group Global Plugin Styles */
@@ -9,10 +11,10 @@
 }
 
 #bnc-global .postbox {
-	padding: 10px;
 	position: relative;
 	overflow: hidden;
-	-webkit-box-shadow: #ccc 0px 1px 6px;
+	background-color: #fff;
+	padding: 10px;
 }
 
 #bnc-global .postbox h3 {
@@ -22,7 +24,6 @@
 
 #bnc-global a {
 	text-decoration: none;
-	font-size: 11px;
 }
 
 #bnc-global a.orange-link {
@@ -41,7 +42,6 @@
 
 #bnc-global, #bnc-global .postbox, #bnc-global .postbox ul, #bnc-global .postbox p, #bnc-global p {
 	margin-top: 10px;
-	font-size: 11px;
 }
 
 #bnc-global .left-content {
@@ -57,8 +57,6 @@
 	padding: 0 0 4px;
 	letter-spacing: 0;
 	color: #d54e21;
-	font-size: 11px;
-	line-height: 13px;
 }
 
 #bnc-global .left-content p {
@@ -87,9 +85,8 @@
 	float: left;
 	margin-left: 3%;
 	border-left: 1px solid #e6e6e6;
-	padding-bottom: 45px;
 	padding-left: 10px;
-	margin-bottom: -30px;
+	padding-bottom: 50px;
 }
 
 #bnc-global .bnc-clearer {
@@ -100,7 +97,6 @@
 	vertical-align: baseline;
 	width: 176px;
 	margin-right: 5px;
-	border: 1px solid #6caccd;
 }
 
 #bnc-global input.checkbox {
@@ -111,14 +107,11 @@
 }
 
 #bnc-global input {
-	border: 2px solid #a4c6d3;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
 	margin-right: 7px;
 	width: 177px;
 	color: #555;
-	font-size: 11px;
-	background-color: #ebf1ff;
 	margin-left: 5px;
 }
 
@@ -189,18 +182,6 @@
 
 /* @group Save/Restore Button Area */
 
-#bnc-global .bnc-plugin-version {
-	float: right;
-	font: 18px Georgia, "Times New Roman", Times, serif;
-	color: #70777a;
-	text-shadow: #fff -1px -1px 0;
-	letter-spacing: -1px;
-	margin-top: 2px;
-	position: relative;
-	left: 10px;
-	margin-bottom: 25px;
-}
-
 #bnc-global input#bnc-button {
 	color: #fff;
 }

wp-content/plugins/wptouch/admin-css/wptouch-admin.css

@@ -9,28 +9,23 @@
 	overflow: hidden;
 	position: relative;
 	min-height: 216px;
+	height: 218px;
 }
 
 #wptouch-head #wptouch-head-colour {
-	background-color: #bcced9;
+	background-color: #d7ebf7;
 	padding: 10px;
 	margin: -10px -10px -20px;
-	-webkit-border-top-right-radius: 5px;
-	-webkit-border-top-left-radius: 5px;
-	-moz-border-radius-topright: 5px;
-	-moz-border-radius-topleft: 5px;
-	border: 1px solid #e5f0f2;
-	border-bottom: 1px solid #a2bdbf;
 }
 
 #wptouch-head-title {
-	font: bold 22px Georgia, "Times New Roman", Times, serif;
 	color: #333c42;
-	text-shadow: #deeefa 0 1px 0;
+	text-shadow: #f6f8fd 0 1px 0;
 	letter-spacing: -1px;
 	margin: 0;
 	padding: 0;
 	float: left;
+	font-size: 22px;
 }
 
 #wptouch-head .postbox img.ajax-load {
@@ -45,9 +40,12 @@
 }
 
 #wptouch-head-links a {
-	color: #333c42;
-	font-weight: bold;
-	text-shadow: #cddce8 0 1px 0;
+	color: #62727c;
+	font-weight: normal;
+	text-shadow: rgba(255,255,255,.5) 0 1px 0;
+	font-style: normal;
+	padding-right: 5px;
+	padding-left: 5px;
 }
 
 #wptouch-head-links a:hover {
@@ -131,7 +129,7 @@
 #wptouch-news-support li {
 	border-bottom: 1px solid #e6e6e6;
 	margin: 0;
-	padding: 3px 0 3px 12px;
+	padding: 5px 0 5px 12px;
 	list-style-type: disc;
 	list-style-position: inside;
 	color: #c1cfd1;
@@ -146,8 +144,8 @@
 #wptouch-news-support p#find-out-more {
 	font-weight: bold;
 	position: absolute;
-	right: 385px;
-	top: 176px;
+	right: 380px;
+	top: 195px;
 }
 
 /* @end */

wp-content/plugins/wptouch/ajax/file_upload.php

@@ -3,6 +3,7 @@
 	$directory_list = array();
 	
 	if ( current_user_can( 'upload_files' ) ) {
+		check_ajax_referer( 'wptouch-upload' );
 		$upload_dir = compat_get_upload_dir() . "/wptouch/custom-icons" . ltrim( $dir[1], '/' );
 		$dir_paths = explode( '/', $upload_dir );
 		$dir = '';

wp-content/plugins/wptouch/html/ads-stats-area.php

@@ -15,7 +15,7 @@
 			 		<div id="css-info" style="display:none">
 					<h2><?php _e( "More Info", "wptouch" ); ?></h2>
 					<p><?php _e( "You may enter a custom css file link easily. Simply add the full link to the css file like this:", "wptouch" ); ?></p>
-					<p><?php _e( "<code>&lt;link rel=&quot;stylesheet&quot; src=&quot;http://path-to-my-css-file&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;</code>", "wptouch" ); ?></p>
+					<p><?php _e( "<code>&lt;style type=&quot;text/css&quot;&gt;#mydiv { color: red; }&lt;/style&gt;</code>", "wptouch" ); ?></p>
 				</div>
 
 			</div><!-- left content -->

wp-content/plugins/wptouch/html/advanced-area.php

@@ -15,6 +15,14 @@
 	
 	<div class="right-content">
 		<ul>
+			<li>
+				<input class="checkbox" type="checkbox" name="enable-zoom" <?php if ( isset( $wptouch_settings['enable-zoom']) && $wptouch_settings['enable-zoom'] == 1) echo('checked'); ?> />
+				<label class="label" for="enable-zoom"><?php _e( "Allow zooming on content", "wptouch" ); ?> <a href="#zoom-info" class="fancylink">?</a></label>
+				<div id="zoom-info" style="display:none">
+					<h2><?php _e( "More Info", "wptouch" ); ?></h2>
+					<p><?php _e( "This will allow users to zoom in and out on content.", "wptouch" ); ?></p>
+				</div>
+			</li>
 			<li>
 				<input class="checkbox" type="checkbox" name="enable-cats-button" <?php if ( isset( $wptouch_settings['enable-cats-button']) && $wptouch_settings['enable-cats-button'] == 1) echo('checked'); ?> />
 				<label class="label" for="enable-cats-button"><?php _e( "Enable Categories tab in the header", "wptouch" ); ?> <a href="#cats-info" class="fancylink">?</a></label>
@@ -107,7 +115,7 @@
 				<label class="label" for="enable-exclusive"> <?php _e( "Enable WPtouch Restricted Mode", "wptouch" ); ?> <a href="#restricted-info" class="fancylink">?</a></label>
 					<div id="restricted-info" style="display:none">
 						<h2><?php _e( "More Info", "wptouch" ); ?></h2>
-						<p><?php _e( "Disallow other plugins from loading into scripts into WPtouch's header and footer.", "wptouch" ); ?></p> 
+						<p><?php _e( "Disallow other plugins from loading scripts into WPtouch's header and footer.", "wptouch" ); ?></p> 
 						<p><?php _e( "Sometimes fixes incompatibilities and speeds up WPtouch.", "wptouch" ); ?></p>
 						<p><?php _e( "Some plugins load conflicting javascript, extra CSS style sheets, and other functional code into your theme to accomplish what they add to your site. As WPtouch works complete on its own without any other plugin installed, in some cases (where you have several plugins or find something doesn't work right with WPtouch) you may want to enable Restricted Mode to ensure that WPtouch works properly, and loads quickly for mobile users.", "wptouch" ); ?></p>
 					</div>

wp-content/plugins/wptouch/html/general-settings-area.php

@@ -6,25 +6,35 @@
 
 			<div class="left-content">
 				<h4><?php _e( "Regionalization Settings", "wptouch" ); ?></h4>
-				<p><?php _e( "Select the language you would like WPtouch to appear in.  Custom language .mo files should be placed in wp-content/wptouch/lang.", "wptouch" ); ?></p>
-				<br />
+				<p><?php _e( "Select the language for WPtouch.  Custom .mo files should be placed in wp-content/wptouch/lang.", "wptouch" ); ?></p>
+				<br /><br />
+
 				<h4><?php _e( "Home Page Re-Direction", "wptouch" ); ?></h4>
-				<p><?php echo sprintf( __( "WPtouch by default follows your %sWordPress &raquo; Reading Options%s. You can also set a different one for WPtouch.", "wptouch"), '<a href="options-reading.php">', '</a>' ); ?></p>
+				<p><?php echo sprintf( __( "WPtouch by default follows your %sWordPress &raquo; Reading Options%s.", "wptouch"), '<a href="options-reading.php">', '</a>' ); ?></p>
 
 				<h4><?php _e( "Site Title", "wptouch" ); ?></h4>
-				<p><?php _e( "You can shorten your site title here so it won't be truncated by WPtouch.", "wptouch" ); ?></p>
+				<p><?php _e( "You can change your site title (if needed) in WPtouch.", "wptouch" ); ?></p>
+
+				<br /><br />
 
 				<h4><?php _e( "Excluded Categories", "wptouch" ); ?></h4>
-				<p><?php _e( "Choose categories you want excluded from the main post listings in WPtouch.", "wptouch" ); ?></p>
+				<p><?php _e( "Categories by ID you want excluded everywhere in WPtouch.", "wptouch" ); ?></p>
+
+				<h4><?php _e( "Excluded Tags", "wptouch" ); ?></h4>
+				<p><?php _e( "Tags by ID you want excluded everywhere in WPtouch.", "wptouch" ); ?></p>
+
+				<br /><br />
 
 				<h4><?php _e( "Text Justification Options", "wptouch" ); ?></h4>
 				<p><?php _e( "Set the alignment for text.", "wptouch" ); ?></p>
 
+				<br /><br />
 				
 				<h4><?php _e( "Post Listings Options", "wptouch" ); ?></h4>
 				<p><?php _e( "Choose between calendar Icons, post thumbnails (WP 2.9) or none for your post listings.", "wptouch" ); ?></p>
 				<p><?php _e( "Select which meta items are shown below titles on main, search, &amp; archives pages.", "wptouch" ); ?></p>
-				<p><?php _e( "Also, choose if excerpts are shown/hidden (default is hidden).", "wptouch" ); ?></p>
+
+				<br /><br />
 
 				<h4><?php _e( "Footer Message", "wptouch" ); ?></h4>
 				<p><?php _e( "Customize the default footer message shown in WPtouch here.", "wptouch" ); ?></p>
@@ -71,9 +81,10 @@
 
 				<ul class="wptouch-make-li-italic">			
 				<li><input name="excluded-cat-ids" class="no-right-margin" type="text" value="<?php $str = $wptouch_settings['excluded-cat-ids']; echo stripslashes($str); ?>" /><?php _e( "Comma list of Category IDs, eg: 1,2,3", "wptouch" ); ?></li>
+				<li><input name="excluded-tag-ids" class="no-right-margin" type="text" value="<?php $str = $wptouch_settings['excluded-tag-ids']; echo stripslashes($str); ?>" /><?php _e( "Comma list of Tag IDs, eg: 1,2,3", "wptouch" ); ?></li>
 				</ul>
 
-				<br />
+				<br /><br />
 
 				<ul class="wptouch-make-li-italic">
 
@@ -124,6 +135,7 @@
 						<label for="enable-excerpts"><?php _e( "Hide Excerpts", "wptouch" ); ?></label>
 					</li>
 				</ul>
+				<br /><br />
 				<ul class="wptouch-make-li-italic">
 					<li><input type="text" class="no-right-margin footer-msg" name="custom-footer-msg" value="<?php $str = $wptouch_settings['custom-footer-msg']; echo stripslashes($str); ?>" /><?php _e( "Footer message", "wptouch" ); ?></li>
 				</ul>

wp-content/plugins/wptouch/html/head-area.php

@@ -10,8 +10,8 @@
 			</div>
 				<div id="wptouch-head-links">
 					<ul>
-						<li><?php echo sprintf(__( "%sGet WPtouch Pro%s", "wptouch" ), '<a href="http://www.bravenewcode.com/products/wptouch-pro/?utm_source=wptouch&amp;utm_medium=web&amp;utm_campaign=top-' . str_replace( '.', '', $bnc_wptouch_version ) . '" target="_blank">','</a>'); ?> | </li>
-						<li><?php echo sprintf(__( "%sFREE Affiliate Program%s", "wptouch" ), '<a href="http://www.bravenewcode.com/affiliate-program/" target="_blank">','</a>'); ?></li> |
+						<li><?php echo sprintf(__( "%sGet WPtouch Pro%s", "wptouch" ), '<a href="http://www.bravenewcode.com/store/plugins/wptouch-pro/?utm_source=wptouch&amp;utm_medium=web&amp;utm_campaign=top-' . str_replace( '.', '', $bnc_wptouch_version ) . '" target="_blank">','</a>'); ?> | </li>
+						<li><?php echo sprintf(__( "%sJoin our FREE Affiliate Program%s", "wptouch" ), '<a href="http://www.bravenewcode.com/affiliate-program/" target="_blank">','</a>'); ?></li> |
 						<li><?php echo sprintf(__( "%sFollow Us on Twitter%s", "wordtwit" ), '<a href="http://www.twitter.com/bravenewcode" target="_blank">','</a>'); ?></li>
 					</ul>
 				</div>
@@ -30,7 +30,7 @@
 			<div id="wptouch-support-wrap">			
 			<h3>&nbsp;</h3>
 				<div id="wptouch-support-content">
-				<p id="find-out-more"><a href="http://www.bravenewcode.com/products/wptouch-pro/?utm_source=wptouch&amp;utm_medium=web&amp;utm_campaign=find-out-more-<?php echo str_replace( '.', '', $bnc_wptouch_version ); ?>" target="_blank"><?php _e( "Find Out More &rsaquo;", "wptouch" ); ?></a></p>
+				<p id="find-out-more"><a href="http://www.bravenewcode.com/products/wptouch-pro/?utm_source=wptouch&amp;utm_medium=web&amp;utm_campaign=find-out-more-<?php echo str_replace( '.', '', $bnc_wptouch_version ); ?>" target="_blank"><?php _e( "Find Out More &rsaquo;&rsaquo;", "wptouch" ); ?></a></p>
 				</div>
 			</div>
 			
@@ -38,4 +38,4 @@
 
 	<div class="bnc-clearer"></div>
 	</div><!-- postbox -->
-</div><!-- wptouch-head -->
\ No newline at end of file
+</div><!-- wptouch-head -->

wp-content/plugins/wptouch/html/icon-area.php

@@ -12,6 +12,9 @@ var button = jQuery('#upload-icon'), interval;
 		jQuery("#upload_progress").hide();
 		jQuery('#upload_response').hide().html(response).fadeIn(); 
 		jQuery('#icon-pool-area').load('<?php echo admin_url( 'options-general.php?page=wptouch/wptouch.php' ); ?> #wptouchicons');	
+		},
+		data: {
+			_ajax_nonce: '<?php echo wp_create_nonce('wptouch-upload'); ?>'
 		}
 	});
 });

wp-content/plugins/wptouch/html/page-area.php

@@ -35,7 +35,12 @@
 			</li>
 			<li><input type="checkbox" class="checkbox" name="enable-main-home" <?php if (isset($wptouch_settings['enable-main-home']) && $wptouch_settings['enable-main-home'] == 1) echo('checked'); ?> /><label for="enable-main-home"><?php _e( "Enable Home Menu Item", "wptouch" ); ?></label></li>
 			<li><input type="checkbox" class="checkbox" name="enable-main-rss" <?php if (isset($wptouch_settings['enable-main-rss']) && $wptouch_settings['enable-main-rss'] == 1) echo('checked'); ?> /><label for="enable-main-rss"><?php _e( "Enable RSS Menu Item", "wptouch" ); ?></label></li>
-			<li><input type="checkbox" class="checkbox" name="enable-main-email" <?php if (isset($wptouch_settings['enable-main-email']) && $wptouch_settings['enable-main-email'] == 1) echo('checked'); ?> /><label for="enable-main-email"><?php _e( "Enable Email Menu Item", "wptouch" ); ?> <small>(<?php _e( "Uses default WordPress admin e-mail", "wptouch" ); ?>)</small></label><br /><br /><br /></li>
+			<li><input type="checkbox" class="checkbox" name="enable-main-email" <?php if (isset($wptouch_settings['enable-main-email']) && $wptouch_settings['enable-main-email'] == 1) echo('checked'); ?> /><label for="enable-main-email"><?php _e( "Enable Email Menu Item", "wptouch" ); ?> <small>(<?php _e( "Uses default WordPress admin e-mail", "wptouch" ); ?>)</small></label><br /></li>
+			<?php if ( function_exists( 'twentyeleven_setup' ) || function_exists( 'twentyten_setup' ) ) { ?>
+				<li><input type="checkbox" class="checkbox" name="enable-twenty-eleven-footer" <?php if ( isset( $wptouch_settings['enable-twenty-eleven-footer']) && $wptouch_settings['enable-twenty-eleven-footer'] == 1) echo( 'checked' ); ?> /><label for="enable-twenty-eleven-footer"><?php _e( "Show powered by WPtouch in footer", "wptouch" ); ?> <small>(<?php _e( "Adds WPtouch to the 'Powered by WordPress' area in footer of desktop theme", "wptouch" ); ?>)</small></label>
+			<?php } ?>
+
+			<br /><br />
 		
 		<?php if ( count( $pages ) ) { ?>
 			<li><br /><br />
@@ -54,7 +59,7 @@
 						<label class="wptouch-page-label" for="enable_<?php echo $page->ID; ?>"><?php echo $page->post_title; ?></label>
 					</span>
 					<select class="page-select" name="icon_<?php echo $page->ID; ?>">
-						<?php bnc_get_icon_drop_down_list( $wptouch_settings[ $page->ID ]); ?>
+						<?php bnc_get_icon_drop_down_list( ( isset( $wptouch_settings[ $page->ID ] ) ? $wptouch_settings[ $page->ID ] : false ) ); ?>
 					</select>
 					
 				</li>

wp-content/plugins/wptouch/html/plugin-compat-area.php

@@ -14,13 +14,13 @@
 						echo '' . get_bloginfo('version') . '';
 						echo '</p><p class="wptv">';
 						echo sprintf( __( 'WPtouch %s support: ', 'wptouch' ), $bnc_wptouch_version );
-						if ($version > 3.1) {
+						if ($version > 3.2) {
 							echo sprintf(__( "%sUnverified%s", "wptouch" ), '<span class="caution">','</span>');
-						} elseif ($version >= 2.8) {
-							echo sprintf(__( "%sSupported%s", "wptouch" ), '<span class="go">','</span>');
+						} else if ($version >= 2.9) {
+							echo sprintf(__( "%sSupported.%s", "wptouch" ), '<span class="go">','</span>');
 						} else {
 							echo sprintf(__( "%sUnsupported. Upgrade Required.%s", "wptouch" ), '<span class="red">','</span>');
-						} 
+						}
 						echo '</p>';
 					?>	
 				</div>

wp-content/plugins/wptouch/html/push-area.php

@@ -15,8 +15,8 @@
 						<input name="prowl-api" type="text" value="<?php echo $wptouch_settings['prowl-api']; ?>" /><?php _e( "Prowl API Key", "wptouch" ); ?> (<?php echo sprintf(__( "%sCreate a key now%s", "wptouch" ), '<a href="https://prowl.weks.net/settings.php" target="_blank">','</a>'); ?> - <a href="#prowl-info" class="fancylink">?</a>)
 						<div id="prowl-info" style="display:none">
 							<h2><?php _e( "More Info", "wptouch" ); ?></h2>
-							<p><?php _e( "In order to enable Prowl notifications, you must create a Prowl account, and download/configure the Prowl application for iPhone.", "wptouch" ); ?></p>
-							<p><?php _e( "Next, visit the Prowl website and generate your API key, which we use to connect securely and send your notifications.", "wptouch" ); ?></p>
+							<p><?php _e( "In order to enable Prowl notifications you must create a Prowl account and download + configure the Prowl application for iPhone.", "wptouch" ); ?></p>
+							<p><?php _e( "Next, visit the Prowl website and generate your API key, which WPtouch will use to send your notifications.", "wptouch" ); ?></p>
 							
 							<p><?php echo sprintf(__( "%sVisit the Prowl Website%s", "wptouch" ), '<a href="http://prowl.weks.net/settings.php" target="_blank">','</a>'); ?> | <?php echo sprintf(__( "%sVisit iTunes to Download Prowl%s", "wptouch" ), '<a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=320876271&amp;mt=8" target="_blank">','</a>'); ?></p>
 						</div>		

wp-content/plugins/wptouch/include/icons.php

@@ -47,9 +47,9 @@
 			foreach ( $icons[ $key ] as $icon ) {