Fixed all debug warnings

Author: gregpriday

Origin.php

@@ -185,13 +185,17 @@ function render_page(){
 		$selectors = $this->css->get_setting_selectors();
 		$css_js_function = $this->css->get_js_function();
 
-		$updated = ($_POST['action'] == 'save');
+		$updated = (@$_POST['action'] == 'save');
 
 		// Get the current filters
 		$user = wp_get_current_user();
-		$user_filters = get_user_meta($user->ID, 'origin_filters', true);
-		if($user_filters['theme'] != $this->theme_name) unset($user_filters);
-		if(empty($user_filters)) $user_filters = array('section' => null, 'tag' => null, 'selector' => null);
+		$user_filters = get_user_meta($user->ID, 'origin_filters', false);
+		
+		if(empty($user_filters) || @$user_filters['theme'] != $this->theme_name){
+			$user_filters['section'] = null;
+			$user_filters['tag'] = null;
+			$user_filters['selector'] = null;
+		}
 
 		// Start URL is the page we'll start the preview from
 		if(!empty($_GET['ref'])) $start_url = $_GET['ref'];
@@ -226,6 +230,10 @@ function get_storage_url($sub = ''){
 		return $upload_dir['baseurl'].'/origin'.(!empty($sub) ? '/'.$sub : '');
 	}
 
+	public function get_config(){
+		return $this->_config;
+	}
+	
 	////////////////////////////////////////////////////////////////////////////
 	// Action functions (add_action)
 	////////////////////////////////////////////////////////////////////////////
@@ -335,7 +343,7 @@ function action_admin_bar_menu(){
 
 		if(!is_admin() && !is_404()){
 			$href = add_query_arg(array(
-				'ref' => 'http://'.$_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]
+				'ref' => urlencode('http://'.$_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"])
 			), $href);
 		}
 
@@ -344,22 +352,13 @@ function action_admin_bar_menu(){
 
 		list($v) = explode('-', $wp_version, 2);
 
-		if(version_compare($v, '3.3', '>=')){
-			// WP >= 3.3 uses a different admin bar structure
-			$wp_admin_bar->add_menu(array(
-				'parent' => 'site-name',
-				'title' => 'Design',
-				'href' => $href,
-			));
-		}
-		else{
-			// Older menu bar has an appearance tab
-			$wp_admin_bar->add_menu(array(
-				'parent' => 'appearance',
-				'title' => 'Design',
-				'href' => $href,
-			));
-		}
+		$wp_admin_bar->add_menu(array(
+			// Parent is dependent on WordPress version
+			'parent' => version_compare($v, '3.3', '>=') ? 'site-name' : 'appearance',
+			'title' => 'Design',
+			'id' => 'origin-design',
+			'href' => $href
+		));
 
 		return $wp_admin_bar;
 	}

config.php

@@ -1,6 +1,7 @@
 <?php
 
 return array(
+	'mode' => 'dev',
 	'endpoint' => 'http://192.168.1.102:8888/theme',
 	'path' => 'plugins/origin'
 );

inc/CSS.php

@@ -26,7 +26,7 @@ function __construct($filename = null){
 	/**
 	 * Parse a CSS file
 	 */
-	function parse(){
+	function parse($file = null){
 		if(!empty($this->css_doc)) return $this->css_doc;
 		if(!class_exists('CSSParser')) require(dirname(__FILE__).'/../externals/css-parser/CSSParser.php');
 

inc/CSS_Executor.php

@@ -49,6 +49,7 @@ public static function rgba($color, $opacity){
 	////////////////////////////////////////////////////////////////////////////
 
 	public static function css_texture($name, $level){
+		if($name == '::none' || $level == 0) return 'none';
 		return 'url('.get_template_directory_uri().'/images/textures/levels/'.$name.'_l'.$level.'.png)';
 	}
 

inc/Image.php

@@ -87,7 +87,13 @@ function get_preset_url($preset, $attachment_id, $filename = 'image.jpg'){
 			return site_url().'/oim/'.urlencode($preset).'/'.intval($attachment_id).'/'.$filename.'/';
 		}
 		else{
-			// TODO Return an ugly version
+			// Return an ugly version
+			return add_query_arg(array(
+				'om' => 'im_preset',
+				'resize_preset' => $preset,
+				'attachment_id' => intval($attachment_id),
+				'filename' => $filename
+			), site_url());
 		}
 	}
 
@@ -97,7 +103,7 @@ function get_preset_url($preset, $attachment_id, $filename = 'image.jpg'){
 	function flush_rewrite_rules(){
 		$rules = get_option( 'rewrite_rules' );
 		// Flush the rules
-		if(count(array_intersect(array_keys(self::$_url_rules) , array_keys($rules))) != count(self::$_url_rules)){
+		if(!empty($rules) && count(array_intersect(array_keys(self::$_url_rules) , array_keys($rules))) != count(self::$_url_rules)){
 			// Flush the rules
 			global $wp_rewrite;
 			$wp_rewrite->flush_rules();
@@ -149,14 +155,19 @@ function method_preset(){
 
 			// Test if the location is valid
 			exec("$convert -version", $output);
-			preg_match('/'.preg_quote('Version: ImageMagick ').'([0-9.-]+)/', $output[0], $matches);
 
-			// We need at least image magick 6.5
-			if(isset($matches[1]) && version_compare($matches[1], '6', '>='))
-				set_site_transient('imagemagick_location', $convert, 86400);
+			if(!empty($output)){
+				preg_match('/'.preg_quote('Version: ImageMagick ').'([0-9.-]+)/', $output[0], $matches);
+				
+				// We need at least image magick 6.5
+				if(isset($matches[1]) && version_compare($matches[1], '6', '>=')){
+					$convert = trim($convert);
+					set_site_transient('imagemagick_location', $convert, 86400);
+				}
+				else $convert = null;
+			}
 			else $convert = null;
 		}
-		$convert = trim($convert);
 
 		// Get the base folder of the file
 		$attachment = wp_get_attachment_metadata($post->ID);
@@ -197,8 +208,8 @@ function method_preset(){
 		header('Pragma: no-cache');
 
 		// Ensure there's nothing waiting in the buffer
-		ob_clean();
-		flush();
+		@ob_clean();
+		@flush();
 
 		// Display the image
 		readfile($file);

inc/Settings.php

@@ -84,7 +84,7 @@ function get_sense_values(){
 	 * @return Origin_Type The class setting.
 	 */
 	function get_object($section, $setting){
-		if(empty($this->_objects[$section][$settings])){
+		if(empty($this->_objects[$section][$setting])){
 			// Instantiate the settings class
 			$type = $this->_settings[$section]['settings'][$setting]['type'];
 			$class = 'Origin_Type_'.ucfirst(strtolower($type));
@@ -112,7 +112,7 @@ function set($section, $name, $value){
 	}
 
 	/**
-	 * Saves Origin's state based on the POST variables.
+	 * Saves Origin's state based on the POST variables. Also creates the CSS file.
 	 */
 	function save($input = null){
 		if($input == null) $input = $_POST;
@@ -129,8 +129,7 @@ function save($input = null){
 		}
 
 		// Create the folder if it doesn't already exist
-		if(!is_dir(WP_CONTENT_DIR.'/origin')) mkdir(WP_CONTENT_DIR.'/origin', 0777, true);
-		$filename = WP_CONTENT_DIR.'/origin/'.Origin::single()->theme_name.'.css';
+		$filename = Origin::single()->css->get_css_path();;
 
 		// Save the CSS
 		file_put_contents($filename, Origin::single()->css->get_css($this->_values));
@@ -201,6 +200,8 @@ function get_score(){
 		$design = $this->get_sense_values();
 		$user = wp_get_current_user();
 
+		$wp_version = get_bloginfo('version');
+		
 		$args = array(
 			'method' => 'POST',
 			'timeout' => 45,
@@ -221,7 +222,7 @@ function get_score(){
 			'user-agent' => 'WordPress/' . $wp_version . '; ' . get_site_url()
 		);
 
-		$raw_response = wp_remote_post($this->_config->endpoint.'/'.Origin::single()->theme_name, $args);
+		$raw_response = wp_remote_post(Origin::single()->get_config()->endpoint.'/'.Origin::single()->theme_name, $args);
 
 		if (!is_wp_error($raw_response) && ($raw_response['response']['code'] == 200))
 			$response = unserialize($raw_response['body']);

inc/types/slider.php

@@ -51,7 +51,7 @@ class="preview-field"
 
 	function process_input($input){
 		// WordPress doesn't seem to like storing booleans, so we use strings.
-		if($this->settings['is_int']) $this->value = intval($input[$this->form_name]);
+		if(!empty($this->settings['is_int'])) $this->value = intval($input[$this->form_name]);
 		else $this->value = floatval($_POST[$this->form_name]);
 
 	}

inc/types/type.php

@@ -59,7 +59,7 @@ function get_setting($name, $default = false){
 	}
 
 	function value(){
-		return isset($this->value) ? $this->value : $this->settings['default'];
+		return isset($this->value) ? $this->value : @$this->settings['default'];
 	}
 
 	function set_value($value){

js/preview/executor.js

@@ -49,6 +49,7 @@ var originExecutor = {
 	////////////////////////////////////////////////////////////////////////////
 
 	css_texture : function(name, level) {
+		if(name == '::none' || level == 0) return 'none';
 		return 'url('+originSettings.templateUrl+'/images/textures/levels/'+name+'_l'+level+'.png)';
 	},
 

tpl/admin.phtml

@@ -106,7 +106,7 @@
 						<legend class="screen-reader-text"><span><?php print $field['#label'] ?></span></legend>
 
 						<?php $obj->render_form(); ?>
-						<?php if($field['description']) : ?><p class="description"><?php print $field['description'] ?></p><?php endif; ?>
+						<?php if(!empty($field['description'])) : ?><p class="description"><?php print $field['description'] ?></p><?php endif; ?>
 					</fieldset>
 					</td>
 					</tr>