jarednova / timber

lib/timber-posts-collection.php

Indentation +4 added lines, -4 removed lines

@@ -51,10 +51,10 @@
         return $this->getArrayCopy();
     }
 
-     /**
-     * @param array $posts
-     * @return array
-     */
+        /**
+         * @param array $posts
+         * @return array
+         */
     static function maybe_set_preview( $posts ) {
         if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
                && isset( $_GET['preview_id'] ) && $_GET['preview_id']

lib/timber-url-helper.php

Indentation +303 added lines, -303 removed lines

@@ -2,333 +2,333 @@
 
 class TimberURLHelper {
 
-	/**
-	 *
-	 *
-	 * @return string
-	 */
-	public static function get_current_url() {
-		$pageURL = "http://";
-		if ( isset( $_SERVER['HTTPS'] ) && $_SERVER["HTTPS"] == "on" ) {
-			$pageURL = "https://";;
-		}
-		if ( isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] && $_SERVER["SERVER_PORT"] != "80" ) {
-			$pageURL .= self::get_host() . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
-		} else {
-			$pageURL .= self::get_host() . $_SERVER["REQUEST_URI"];
-		}
-		return $pageURL;
-	}
+    /**
+     *
+     *
+     * @return string
+     */
+    public static function get_current_url() {
+        $pageURL = "http://";
+        if ( isset( $_SERVER['HTTPS'] ) && $_SERVER["HTTPS"] == "on" ) {
+            $pageURL = "https://";;
+        }
+        if ( isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] && $_SERVER["SERVER_PORT"] != "80" ) {
+            $pageURL .= self::get_host() . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
+        } else {
+            $pageURL .= self::get_host() . $_SERVER["REQUEST_URI"];
+        }
+        return $pageURL;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return bool
-	 */
-	public static function is_url( $url ) {
-		if ( !is_string( $url ) ) {
-			return false;
-		}
-		$url = strtolower( $url );
-		if ( strstr( $url, '://' ) ) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return bool
+     */
+    public static function is_url( $url ) {
+        if ( !is_string( $url ) ) {
+            return false;
+        }
+        $url = strtolower( $url );
+        if ( strstr( $url, '://' ) ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 *
-	 * @return string
-	 */
-	public static function get_path_base() {
-		$struc = get_option( 'permalink_structure' );
-		$struc = explode( '/', $struc );
-		$p = '/';
-		foreach ( $struc as $s ) {
-			if ( !strstr( $s, '%' ) && strlen( $s ) ) {
-				$p .= $s . '/';
-			}
-		}
-		return $p;
-	}
+    /**
+     *
+     *
+     * @return string
+     */
+    public static function get_path_base() {
+        $struc = get_option( 'permalink_structure' );
+        $struc = explode( '/', $struc );
+        $p = '/';
+        foreach ( $struc as $s ) {
+            if ( !strstr( $s, '%' ) && strlen( $s ) ) {
+                $p .= $s . '/';
+            }
+        }
+        return $p;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @param bool    $force
-	 * @return string
-	 */
-	public static function get_rel_url( $url, $force = false ) {
-		$url_info = parse_url( $url );
-		if ( isset( $url_info['host'] ) && $url_info['host'] != self::get_host() && !$force ) {
-			return $url;
-		}
-		$link = '';
-		if ( isset( $url_info['path'] ) ) {
-			$link = $url_info['path'];
-		}
-		if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
-			$link .= '?' . $url_info['query'];
-		}
-		if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
-			$link .= '#' . $url_info['fragment'];
-		}
-		$link = TimberURLHelper::remove_double_slashes( $link );
-		return $link;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @param bool    $force
+     * @return string
+     */
+    public static function get_rel_url( $url, $force = false ) {
+        $url_info = parse_url( $url );
+        if ( isset( $url_info['host'] ) && $url_info['host'] != self::get_host() && !$force ) {
+            return $url;
+        }
+        $link = '';
+        if ( isset( $url_info['path'] ) ) {
+            $link = $url_info['path'];
+        }
+        if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
+            $link .= '?' . $url_info['query'];
+        }
+        if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
+            $link .= '#' . $url_info['fragment'];
+        }
+        $link = TimberURLHelper::remove_double_slashes( $link );
+        return $link;
+    }
 
-	/**
-	 * Some setups like HTTP_HOST, some like SERVER_NAME, it's complicated
-	 * @link http://stackoverflow.com/questions/2297403/http-host-vs-server-name
-	 * @return string the HTTP_HOST or SERVER_NAME
-	 */
-	public static function get_host() {
-		if (isset($_SERVER['HTTP_HOST'])) {
-			return $_SERVER['HTTP_HOST'];
-		}
-		if (isset($_SERVER['SERVER_NAME'])) {
-			return $_SERVER['SERVER_NAME'];
-		}
-		return '';
-	}
+    /**
+     * Some setups like HTTP_HOST, some like SERVER_NAME, it's complicated
+     * @link http://stackoverflow.com/questions/2297403/http-host-vs-server-name
+     * @return string the HTTP_HOST or SERVER_NAME
+     */
+    public static function get_host() {
+        if (isset($_SERVER['HTTP_HOST'])) {
+            return $_SERVER['HTTP_HOST'];
+        }
+        if (isset($_SERVER['SERVER_NAME'])) {
+            return $_SERVER['SERVER_NAME'];
+        }
+        return '';
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return bool
-	 */
-	public static function is_local( $url ) {
-		if ( strstr( $url, self::get_host() ) ) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return bool
+     */
+    public static function is_local( $url ) {
+        if ( strstr( $url, self::get_host() ) ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $src
-	 * @return string
-	 */
-	public static function get_full_path( $src ) {
-		$root = ABSPATH;
-		$old_root_path = $root . $src;
-		$old_root_path = str_replace( '//', '/', $old_root_path );
-		return $old_root_path;
-	}
+    /**
+     *
+     *
+     * @param string  $src
+     * @return string
+     */
+    public static function get_full_path( $src ) {
+        $root = ABSPATH;
+        $old_root_path = $root . $src;
+        $old_root_path = str_replace( '//', '/', $old_root_path );
+        return $old_root_path;
+    }
 
-	/**
-	 * Takes a url and figures out its place based in the file system based on path
-	 * NOTE: Not fool-proof, makes a lot of assumptions about the file path
-	 * matching the URL path
-	 *
-	 * @param string  $url
-	 * @return string
-	 */
-	public static function url_to_file_system( $url ) {
-		$url_parts = parse_url( $url );
-		$path = ABSPATH . $url_parts['path'];
-		$path = str_replace( '//', '/', $path );
-		return $path;
-	}
+    /**
+     * Takes a url and figures out its place based in the file system based on path
+     * NOTE: Not fool-proof, makes a lot of assumptions about the file path
+     * matching the URL path
+     *
+     * @param string  $url
+     * @return string
+     */
+    public static function url_to_file_system( $url ) {
+        $url_parts = parse_url( $url );
+        $path = ABSPATH . $url_parts['path'];
+        $path = str_replace( '//', '/', $path );
+        return $path;
+    }
 
-	public static function file_system_to_url( $fs ) {
-		$relative_path = self::get_rel_path( $fs );
-		$home = home_url( '/'.$relative_path );
-		return $home;
-	}
+    public static function file_system_to_url( $fs ) {
+        $relative_path = self::get_rel_path( $fs );
+        $home = home_url( '/'.$relative_path );
+        return $home;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $src
-	 * @return string
-	 */
-	public static function get_rel_path( $src ) {
-		if ( strstr( $src, ABSPATH ) ) {
-			return str_replace( ABSPATH, '', $src );
-		}
-		//its outside the wordpress directory, alternate setups:
-		$src = str_replace( WP_CONTENT_DIR, '', $src );
-		return WP_CONTENT_SUBDIR . $src;
-	}
+    /**
+     *
+     *
+     * @param string  $src
+     * @return string
+     */
+    public static function get_rel_path( $src ) {
+        if ( strstr( $src, ABSPATH ) ) {
+            return str_replace( ABSPATH, '', $src );
+        }
+        //its outside the wordpress directory, alternate setups:
+        $src = str_replace( WP_CONTENT_DIR, '', $src );
+        return WP_CONTENT_SUBDIR . $src;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return string
-	 */
-	public static function remove_double_slashes( $url ) {
-		$url = str_replace( '//', '/', $url );
-		if ( strstr( $url, 'http:' ) && !strstr( $url, 'http://' ) ) {
-			$url = str_replace( 'http:/', 'http://', $url );
-		}
-		return $url;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return string
+     */
+    public static function remove_double_slashes( $url ) {
+        $url = str_replace( '//', '/', $url );
+        if ( strstr( $url, 'http:' ) && !strstr( $url, 'http://' ) ) {
+            $url = str_replace( 'http:/', 'http://', $url );
+        }
+        return $url;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @param string  $path
-	 * @return string
-	 */
-	public static function prepend_to_url( $url, $path ) {
-		if ( strstr( strtolower( $url ), 'http' ) ) {
-			$url_parts = parse_url( $url );
-			$url = $url_parts['scheme'] . '://' . $url_parts['host'] . $path . $url_parts['path'];
-			if ( isset( $url_parts['query'] ) ) {
-				$url .= $url_parts['query'];
-			}
-			if ( isset( $url_parts['fragment'] ) ) {
-				$url .= $url_parts['fragment'];
-			}
-		} else {
-			$url = $url . $path;
-		}
-		return self::remove_double_slashes( $url );
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @param string  $path
+     * @return string
+     */
+    public static function prepend_to_url( $url, $path ) {
+        if ( strstr( strtolower( $url ), 'http' ) ) {
+            $url_parts = parse_url( $url );
+            $url = $url_parts['scheme'] . '://' . $url_parts['host'] . $path . $url_parts['path'];
+            if ( isset( $url_parts['query'] ) ) {
+                $url .= $url_parts['query'];
+            }
+            if ( isset( $url_parts['fragment'] ) ) {
+                $url .= $url_parts['fragment'];
+            }
+        } else {
+            $url = $url . $path;
+        }
+        return self::remove_double_slashes( $url );
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $path
-	 * @return string
-	 */
-	public static function preslashit( $path ) {
-		if ( strpos( $path, '/' ) != 0 ) {
-			$path = '/' . $path;
-		}
-		return $path;
-	}
+    /**
+     *
+     *
+     * @param string  $path
+     * @return string
+     */
+    public static function preslashit( $path ) {
+        if ( strpos( $path, '/' ) != 0 ) {
+            $path = '/' . $path;
+        }
+        return $path;
+    }
 
-	/**
-	 * This will evaluate wheter a URL is at an aboslute location (like http://example.org/whatever)
-	 *
-	 * @return boolean true if $path is an absolute url, false if relative.
-	 */
-	public static function is_absolute( $path ) {
-		return (boolean) ( strstr( $path, 'http' ) );
-	}
+    /**
+     * This will evaluate wheter a URL is at an aboslute location (like http://example.org/whatever)
+     *
+     * @return boolean true if $path is an absolute url, false if relative.
+     */
+    public static function is_absolute( $path ) {
+        return (boolean) ( strstr( $path, 'http' ) );
+    }
 
-	/**
-	 * This function is slightly different from the one below in the case of:
-	 * an image hosted on the same domain BUT on a different site than the
-	 * Wordpress install will be reported as external content.
-	 *
-	 * @param string  $url a URL to evaluate against
-	 * @return boolean if $url points to an external location returns true
-	 */
-	public static function is_external_content( $url ) {
-		$is_external = TimberURLHelper::is_absolute( $url ) && ! TimberURLHelper::is_internal_content( $url );
+    /**
+     * This function is slightly different from the one below in the case of:
+     * an image hosted on the same domain BUT on a different site than the
+     * Wordpress install will be reported as external content.
+     *
+     * @param string  $url a URL to evaluate against
+     * @return boolean if $url points to an external location returns true
+     */
+    public static function is_external_content( $url ) {
+        $is_external = TimberURLHelper::is_absolute( $url ) && ! TimberURLHelper::is_internal_content( $url );
 
-		return $is_external;
-	}
+        return $is_external;
+    }
 
-	private static function is_internal_content($url) {
-		// using content_url() instead of site_url or home_url is IMPORTANT
-		// otherwise you run into errors with sites that:
-		// 1. use WPML plugin
-		// 2. or redefine content directory
-		$is_content_url = strstr( $url, content_url() );
+    private static function is_internal_content($url) {
+        // using content_url() instead of site_url or home_url is IMPORTANT
+        // otherwise you run into errors with sites that:
+        // 1. use WPML plugin
+        // 2. or redefine content directory
+        $is_content_url = strstr( $url, content_url() );
 
-		// this case covers when the upload directory has been redefined
-		$upload_dir = wp_upload_dir();
-		$is_upload_url = strstr( $url, $upload_dir['baseurl'] );
+        // this case covers when the upload directory has been redefined
+        $upload_dir = wp_upload_dir();
+        $is_upload_url = strstr( $url, $upload_dir['baseurl'] );
 
-		return $is_content_url || $is_upload_url;
-	}
+        return $is_content_url || $is_upload_url;
+    }
     
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return bool     true if $path is an external url, false if relative or local.
-	 *                  true if it's a subdomain (http://cdn.example.org = true)
-	 */
-	public static function is_external( $url ) {
-		$has_http = strstr( strtolower( $url ), 'http' );
-		$on_domain = strstr( $url, self::get_host() );
-		if ( $has_http && !$on_domain ) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return bool     true if $path is an external url, false if relative or local.
+     *                  true if it's a subdomain (http://cdn.example.org = true)
+     */
+    public static function is_external( $url ) {
+        $has_http = strstr( strtolower( $url ), 'http' );
+        $on_domain = strstr( $url, self::get_host() );
+        if ( $has_http && !$on_domain ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Pass links through untrailingslashit unless they are a single /
-	 *
-	 * @param string  $link
-	 * @return string
-	 */
-	public static function remove_trailing_slash( $link ) {
-		if ( $link != "/" )
-			$link = untrailingslashit( $link );
-		return $link;
-	}
+    /**
+     * Pass links through untrailingslashit unless they are a single /
+     *
+     * @param string  $link
+     * @return string
+     */
+    public static function remove_trailing_slash( $link ) {
+        if ( $link != "/" )
+            $link = untrailingslashit( $link );
+        return $link;
+    }
 
-	/**
-	 * Download an external file via a URL
-	 *
-	 * @param string  $url
-	 * @param int     $timeout
-	 * @return string|WP_Error the location of the temporay file name or an error
-	 * @deprecated since 0.20.0
-	 */
-	static function download_url( $url, $timeout = 300 ) {
-		if ( !$url ) {
-			return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
-		}
+    /**
+     * Download an external file via a URL
+     *
+     * @param string  $url
+     * @param int     $timeout
+     * @return string|WP_Error the location of the temporay file name or an error
+     * @deprecated since 0.20.0
+     */
+    static function download_url( $url, $timeout = 300 ) {
+        if ( !$url ) {
+            return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+        }
 
-		$tmpfname = wp_tempnam( $url );
-		if ( !$tmpfname ) {
-			return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
-		}
+        $tmpfname = wp_tempnam( $url );
+        if ( !$tmpfname ) {
+            return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+        }
 
-		$response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+        $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
 
-		if ( is_wp_error( $response ) ) {
-			unlink( $tmpfname );
-			return $response;
-		}
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $tmpfname );
-			return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
-		}
-		return $tmpfname;
-	}
+        if ( is_wp_error( $response ) ) {
+            unlink( $tmpfname );
+            return $response;
+        }
+        if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
+            unlink( $tmpfname );
+            return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+        }
+        return $tmpfname;
+    }
 
-	/**
-	 * Returns the url parameters, for example for url http://example.org/blog/post/news/2014/whatever
-	 * this will return array('blog', 'post', 'news', '2014', 'whatever');
-	 * OR if sent an integer like: TimberUrlHelper::get_params(2); this will return 'news';
-	 *
-	 * @param int $i the position of the parameter to grab.
-	 * @return array|string
-	 */
-	public static function get_params( $i = false ) {
-		$args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
-		$newargs = array();
-		foreach ( $args as $arg ) {
-			if ( strlen( $arg ) ) {
-				$newargs[] = $arg;
-			}
-		}
-		if ( $i === false ) {
-			return $newargs;
-		}
-		if ( $i < 0 ) {
-			//count from end
-			$i = count( $newargs ) + $i;
-		}
-		if ( isset( $newargs[$i] ) ) {
-			return $newargs[$i];
-		}
-	}
+    /**
+     * Returns the url parameters, for example for url http://example.org/blog/post/news/2014/whatever
+     * this will return array('blog', 'post', 'news', '2014', 'whatever');
+     * OR if sent an integer like: TimberUrlHelper::get_params(2); this will return 'news';
+     *
+     * @param int $i the position of the parameter to grab.
+     * @return array|string
+     */
+    public static function get_params( $i = false ) {
+        $args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
+        $newargs = array();
+        foreach ( $args as $arg ) {
+            if ( strlen( $arg ) ) {
+                $newargs[] = $arg;
+            }
+        }
+        if ( $i === false ) {
+            return $newargs;
+        }
+        if ( $i < 0 ) {
+            //count from end
+            $i = count( $newargs ) + $i;
+        }
+        if ( isset( $newargs[$i] ) ) {
+            return $newargs[$i];
+        }
+    }
 
 }

lib/timber-site.php

Indentation +221 added lines, -221 removed lines

@@ -18,242 +18,242 @@
  */
 class TimberSite extends TimberCore implements TimberCoreInterface {
 
-	/**
-	 * @api
-	 * @var string the admin email address set in the WP admin panel
-	 */
-	public $admin_email;
-	public $blogname;
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $charset;
+    /**
+     * @api
+     * @var string the admin email address set in the WP admin panel
+     */
+    public $admin_email;
+    public $blogname;
+    /**
+     * @api
+     * @var string
+     */
+    public $charset;
 
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $description;
-	/**
-	 * @api
-	 * @var int the ID of a site in multisite
-	 */
-	public $id;
-	/**
-	 * @api
-	 * @var string the language setting ex: en-US
-	 */
-	public $language;
-	/**
-	 * @api
-	 * @var string of language attributes for usage in the <html> tag
-	 */
-	public $language_attributes;
-	/**
-	 * @api
-	 * @var bool true if multisite, false if plain ole' WordPress
-	 */
-	public $multisite;
+    /**
+     * @api
+     * @var string
+     */
+    public $description;
+    /**
+     * @api
+     * @var int the ID of a site in multisite
+     */
+    public $id;
+    /**
+     * @api
+     * @var string the language setting ex: en-US
+     */
+    public $language;
+    /**
+     * @api
+     * @var string of language attributes for usage in the <html> tag
+     */
+    public $language_attributes;
+    /**
+     * @api
+     * @var bool true if multisite, false if plain ole' WordPress
+     */
+    public $multisite;
 
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $name;
+    /**
+     * @api
+     * @var string
+     */
+    public $name;
 
-	/** @api
-	 * @var string for people who like trackback spam
-	*/
-	public $pingback_url;
-	public $siteurl;
-	/**
-	 * @api
-	 * @var [TimberTheme](#TimberTheme)
-	 */
-	public $theme;
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $title;
-	public $url;
+    /** @api
+     * @var string for people who like trackback spam
+     */
+    public $pingback_url;
+    public $siteurl;
+    /**
+     * @api
+     * @var [TimberTheme](#TimberTheme)
+     */
+    public $theme;
+    /**
+     * @api
+     * @var string
+     */
+    public $title;
+    public $url;
 
-	/**
-	 * @api
-	 * @var string
-	 */
+    /**
+     * @api
+     * @var string
+     */
 
-	public $rdf;
-	public $rss;
-	public $rss2;
-	public $atom;
+    public $rdf;
+    public $rss;
+    public $rss2;
+    public $atom;
 	
-	/**
-	 * Constructs a TimberSite object
-	 * @example
-	 * ```php
-	 * //multisite setup
-	 * $site = new TimberSite(1);
-	 * $site_two = new TimberSite("My Cool Site");
-	 * //non-multisite
-	 * $site = new TimberSite();
-	 * ```
-	 * @param string|int $site_name_or_id
-	 */
-	function __construct( $site_name_or_id = null ) {
-		$this->init();
-		if ( is_multisite() ) {
-			$this->init_as_multisite( $site_name_or_id );
-		} else {
-			$this->init_as_singlesite();
-		}
-	}
+    /**
+     * Constructs a TimberSite object
+     * @example
+     * ```php
+     * //multisite setup
+     * $site = new TimberSite(1);
+     * $site_two = new TimberSite("My Cool Site");
+     * //non-multisite
+     * $site = new TimberSite();
+     * ```
+     * @param string|int $site_name_or_id
+     */
+    function __construct( $site_name_or_id = null ) {
+        $this->init();
+        if ( is_multisite() ) {
+            $this->init_as_multisite( $site_name_or_id );
+        } else {
+            $this->init_as_singlesite();
+        }
+    }
 
-	/**
-	 * @internal
-	 * @param string|int $site_name_or_id
-	 */
-	protected function init_as_multisite( $site_name_or_id ) {
-		if ( $site_name_or_id === null ) {
-			//this is necessary for some reason, otherwise returns 1 all the time
-			if ( is_multisite() ) {
-				restore_current_blog();
-				$site_name_or_id = get_current_blog_id();
-			}
-		}
-		$info = get_blog_details( $site_name_or_id );
-		$this->import( $info );
-		$this->ID = $info->blog_id;
-		$this->id = $this->ID;
-		$this->name = $this->blogname;
-		$this->title = $this->blogname;
-		$this->url = $this->siteurl;
-		$theme_slug = get_blog_option( $info->blog_id, 'stylesheet' );
-		$this->theme = new TimberTheme( $theme_slug );
-		$this->description = get_blog_option( $info->blog_id, 'blogdescription' );
-		$this->admin_email = get_blog_option( $info->blog_id, 'admin_email' );
-		$this->multisite = true;
-	}
+    /**
+     * @internal
+     * @param string|int $site_name_or_id
+     */
+    protected function init_as_multisite( $site_name_or_id ) {
+        if ( $site_name_or_id === null ) {
+            //this is necessary for some reason, otherwise returns 1 all the time
+            if ( is_multisite() ) {
+                restore_current_blog();
+                $site_name_or_id = get_current_blog_id();
+            }
+        }
+        $info = get_blog_details( $site_name_or_id );
+        $this->import( $info );
+        $this->ID = $info->blog_id;
+        $this->id = $this->ID;
+        $this->name = $this->blogname;
+        $this->title = $this->blogname;
+        $this->url = $this->siteurl;
+        $theme_slug = get_blog_option( $info->blog_id, 'stylesheet' );
+        $this->theme = new TimberTheme( $theme_slug );
+        $this->description = get_blog_option( $info->blog_id, 'blogdescription' );
+        $this->admin_email = get_blog_option( $info->blog_id, 'admin_email' );
+        $this->multisite = true;
+    }
 
-	/**
-	 * Executed for single-blog sites
-	 * @internal
-	 */
-	protected function init_as_singlesite() {
-		$this->admin_email = get_bloginfo( 'admin_email' );
-		$this->name = get_bloginfo( 'name' );
-		$this->title = $this->name;
-		$this->description = get_bloginfo( 'description' );
-		$this->url = get_bloginfo( 'url' );
-		$this->theme = new TimberTheme();
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
-		$this->multisite = false;
-	}
+    /**
+     * Executed for single-blog sites
+     * @internal
+     */
+    protected function init_as_singlesite() {
+        $this->admin_email = get_bloginfo( 'admin_email' );
+        $this->name = get_bloginfo( 'name' );
+        $this->title = $this->name;
+        $this->description = get_bloginfo( 'description' );
+        $this->url = get_bloginfo( 'url' );
+        $this->theme = new TimberTheme();
+        $this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+        $this->multisite = false;
+    }
 
-	/**
-	 * Executed for all types of sites: both multisite and "regular"
-	 * @internal
-	 */
-	protected function init() {
-		$this->rdf = get_bloginfo( 'rdf_url' );
-		$this->rss = get_bloginfo( 'rss_url' );
-		$this->rss2 = get_bloginfo( 'rss2_url' );
-		$this->atom = get_bloginfo( 'atom_url' );
-		$this->language = get_bloginfo( 'language' );
-		$this->charset = get_bloginfo( 'charset' );
-		$this->pingback = get_bloginfo( 'pingback_url' );
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
-		/* deprecated benath this comment */
-		$this->pingback_url = get_bloginfo( 'pingback_url' );
-	}
+    /**
+     * Executed for all types of sites: both multisite and "regular"
+     * @internal
+     */
+    protected function init() {
+        $this->rdf = get_bloginfo( 'rdf_url' );
+        $this->rss = get_bloginfo( 'rss_url' );
+        $this->rss2 = get_bloginfo( 'rss2_url' );
+        $this->atom = get_bloginfo( 'atom_url' );
+        $this->language = get_bloginfo( 'language' );
+        $this->charset = get_bloginfo( 'charset' );
+        $this->pingback = get_bloginfo( 'pingback_url' );
+        $this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+        /* deprecated benath this comment */
+        $this->pingback_url = get_bloginfo( 'pingback_url' );
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $field
-	 * @return mixed
-	 */
-	function __get( $field ) {
-		if ( !isset( $this->$field ) ) {
-			if ( is_multisite() ) {
-				$this->$field = get_blog_option( $this->ID, $field );
-			} else {
-				$this->$field = get_option( $field );
-			}
-		}
-		return $this->$field;
-	}
+    /**
+     *
+     *
+     * @param string  $field
+     * @return mixed
+     */
+    function __get( $field ) {
+        if ( !isset( $this->$field ) ) {
+            if ( is_multisite() ) {
+                $this->$field = get_blog_option( $this->ID, $field );
+            } else {
+                $this->$field = get_option( $field );
+            }
+        }
+        return $this->$field;
+    }
 
-	/**
-	 * @deprecated 0.21.9
-	 * @internal
-	 * @return string
-	 */
-	function get_link() {
-		return $this->link();
-	}
+    /**
+     * @deprecated 0.21.9
+     * @internal
+     * @return string
+     */
+    function get_link() {
+        return $this->link();
+    }
 
-	/**
-	 * @deprecated 0.21.9
-	 * @internal
-	 * @return string
-	 */
-	function get_url() {
-		return $this->get_link();
-	}
+    /**
+     * @deprecated 0.21.9
+     * @internal
+     * @return string
+     */
+    function get_url() {
+        return $this->get_link();
+    }
 
-	/**
-	 * Returns the link to the site's home.
-	 * @example
-	 * ```twig
-	 * <a href="{{ site.link }}" title="Home">
-	 * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
-	 * </a>
-	 * ```
-	 * ```html
-	 * <a href="http://example.org" title="Home">
-	 * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
-	 * </a>
-	 * ```
-	 * @api
-	 * @return string
-	 */
-	public function link() {
-		return $this->url;
-	}
+    /**
+     * Returns the link to the site's home.
+     * @example
+     * ```twig
+     * <a href="{{ site.link }}" title="Home">
+     * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
+     * </a>
+     * ```
+     * ```html
+     * <a href="http://example.org" title="Home">
+     * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
+     * </a>
+     * ```
+     * @api
+     * @return string
+     */
+    public function link() {
+        return $this->url;
+    }
 
-	/**
-	 * @ignore
-	 */
-	public function meta( $field ) {
-		return $this->__get( $field );
-	}
+    /**
+     * @ignore
+     */
+    public function meta( $field ) {
+        return $this->__get( $field );
+    }
 
-	/**
-	 *
-	 * @ignore
-	 * @param string  $key
-	 * @param mixed   $value
-	 */
-	public function update( $key, $value ) {
-		$value = apply_filters( 'timber_site_set_meta', $value, $key, $this->ID, $this );
-		if ( is_multisite() ) {
-			update_blog_option( $this->ID, $key, $value );
-		} else {
-			update_option( $key, $value );
-		}
-		$this->$key = $value;
-	}
+    /**
+     *
+     * @ignore
+     * @param string  $key
+     * @param mixed   $value
+     */
+    public function update( $key, $value ) {
+        $value = apply_filters( 'timber_site_set_meta', $value, $key, $this->ID, $this );
+        if ( is_multisite() ) {
+            update_blog_option( $this->ID, $key, $value );
+        } else {
+            update_option( $key, $value );
+        }
+        $this->$key = $value;
+    }
 
-	/**
-	 *
-	 * @api
-	 * @see TimberSite::link
-	 * @return string
-	 */
-	function url() {
-		return $this->get_link();
-	}
+    /**
+     *
+     * @api
+     * @see TimberSite::link
+     * @return string
+     */
+    function url() {
+        return $this->get_link();
+    }
 
 }

lib/timber-request.php

Indentation +23 added lines, -23 removed lines

@@ -3,32 +3,32 @@
  * TimberRequest exposes $_GET and $_POST to the context
  */
 class TimberRequest extends TimberCore implements TimberCoreInterface {
-	public $post = array();
-	public $get = array();
+    public $post = array();
+    public $get = array();
 	
-	/**
-	 * Constructs a TimberRequest object
-	 * @example
-	 */
-	function __construct() {
-		$this->init();
-	}
-	/**
-	 * @internal
-	 */
-	protected function init() {
-		$this->post = $_POST;
-		$this->get = $_GET;
-	}
+    /**
+     * Constructs a TimberRequest object
+     * @example
+     */
+    function __construct() {
+        $this->init();
+    }
+    /**
+     * @internal
+     */
+    protected function init() {
+        $this->post = $_POST;
+        $this->get = $_GET;
+    }
 
-	public function __call( $field, $args ) {}
+    public function __call( $field, $args ) {}
 
-	public function __get( $field ) {}
+    public function __get( $field ) {}
 
-	/**
-	 * @return boolean
-	 */
-	public function __isset( $field ) {}
+    /**
+     * @return boolean
+     */
+    public function __isset( $field ) {}
 
-	public function meta( $key ) {}
+    public function meta( $key ) {}
 }

lib/image/timber-image-operation-retina.php

Indentation +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Contains the class for running image retina-izing operations
- */
+     * Contains the class for running image retina-izing operations
+     */
 
 /**
  * Increases image size by a given factor
@@ -56,11 +56,11 @@ 
             $image->crop( 0, 0, $src_w, $src_h, $w, $h );
             $result = $image->save( $save_filename );
             if ( is_wp_error( $result ) ) {
-            	// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
-				return false;
-				// @codeCoverageIgnoreEnd
+                // @codeCoverageIgnoreStart
+                TimberHelper::error_log( 'Error resizing image' );
+                TimberHelper::error_log( $result );
+                return false;
+                // @codeCoverageIgnoreEnd
             } else {
                 return true;
             }

lib/image/timber-image-operation-resize.php

Indentation +186 added lines, -186 removed lines

@@ -1,203 +1,203 @@
 <?php
 /**
-	 * Changes image to new size, by shrinking/enlarging
-	 * then cropping to respect new ratio.
-	 *
-	 * Arguments:
-	 * - width of new image
-	 * - height of new image
-	 * - crop method
-	 */
+     * Changes image to new size, by shrinking/enlarging
+     * then cropping to respect new ratio.
+     *
+     * Arguments:
+     * - width of new image
+     * - height of new image
+     * - crop method
+     */
 class TimberImageOperationResize extends TimberImageOperation {
 
-   private $w, $h, $crop;
+    private $w, $h, $crop;
 
-	/**
-	 * @param int    $w    width of new image
-	 * @param int    $h    height of new image
-	 * @param string $crop cropping method, one of: 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center'.
-	 */
-	function __construct($w, $h, $crop) {
-		$this->w = $w;
-		$this->h = $h;
-		// Sanitize crop position
-		$allowed_crop_positions = array( 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center' );
-		if ( $crop !== false && !in_array( $crop, $allowed_crop_positions ) ) {
-			$crop = $allowed_crop_positions[0];
-		}
-		$this->crop = $crop;
-	}
+    /**
+     * @param int    $w    width of new image
+     * @param int    $h    height of new image
+     * @param string $crop cropping method, one of: 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center'.
+     */
+    function __construct($w, $h, $crop) {
+        $this->w = $w;
+        $this->h = $h;
+        // Sanitize crop position
+        $allowed_crop_positions = array( 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center' );
+        if ( $crop !== false && !in_array( $crop, $allowed_crop_positions ) ) {
+            $crop = $allowed_crop_positions[0];
+        }
+        $this->crop = $crop;
+    }
 
-	/**
-	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-	 * @param   string    $src_extension    the extension (ex: .jpg)
-	 * @return  string    the final filename to be used (ex: my-awesome-pic-300x200-c-default.jpg)
-	 */
-	public function filename($src_filename, $src_extension) {
-		$w = 0;
-		$h = 0;
-		if ( $this->w ) {
-			$w = $this->w;
-		}
-		if ( $this->h ) {
-			$h = $this->h;
-		}
-		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ( $this->crop ? $this->crop : 'f' ); // Crop will be either user named or f (false)
-		if($src_extension) {
-			$result .= '.'.$src_extension;
-		}
-		return $result;
-	}
+    /**
+     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+     * @param   string    $src_extension    the extension (ex: .jpg)
+     * @return  string    the final filename to be used (ex: my-awesome-pic-300x200-c-default.jpg)
+     */
+    public function filename($src_filename, $src_extension) {
+        $w = 0;
+        $h = 0;
+        if ( $this->w ) {
+            $w = $this->w;
+        }
+        if ( $this->h ) {
+            $h = $this->h;
+        }
+        $result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ( $this->crop ? $this->crop : 'f' ); // Crop will be either user named or f (false)
+        if($src_extension) {
+            $result .= '.'.$src_extension;
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $load_filename
-	 * @param string $save_filename
-	 */
-	protected function run_animated_gif( $load_filename, $save_filename ) {
-		$image = wp_get_image_editor( $load_filename );
-		$current_size = $image->get_size();
-		$src_w = $current_size['width'];
-		$src_h = $current_size['height'];
-		$w = $this->w;
-		$h = $this->h;
-		if ( !class_exists('Imagick') ) {
-			return false;
-		}
-		$image = new Imagick($load_filename);
-		$image = $image->coalesceImages();
-		$crop = self::get_target_sizes( $load_filename );
-		foreach ($image as $frame) {
-			$frame->cropImage($crop['src_w'], $crop['src_h'], $crop['x'], $crop['y']);
-			$frame->thumbnailImage($w, $h);
-			$frame->setImagePage($w, $h, 0, 0);
-		}
-		$image = $image->deconstructImages();
-		return $image->writeImages($save_filename, true);
-	}
+    /**
+     * @param string $load_filename
+     * @param string $save_filename
+     */
+    protected function run_animated_gif( $load_filename, $save_filename ) {
+        $image = wp_get_image_editor( $load_filename );
+        $current_size = $image->get_size();
+        $src_w = $current_size['width'];
+        $src_h = $current_size['height'];
+        $w = $this->w;
+        $h = $this->h;
+        if ( !class_exists('Imagick') ) {
+            return false;
+        }
+        $image = new Imagick($load_filename);
+        $image = $image->coalesceImages();
+        $crop = self::get_target_sizes( $load_filename );
+        foreach ($image as $frame) {
+            $frame->cropImage($crop['src_w'], $crop['src_h'], $crop['x'], $crop['y']);
+            $frame->thumbnailImage($w, $h);
+            $frame->setImagePage($w, $h, 0, 0);
+        }
+        $image = $image->deconstructImages();
+        return $image->writeImages($save_filename, true);
+    }
 
-	protected function get_target_sizes( $load_filename ) {
-		$image = wp_get_image_editor( $load_filename );
-		$w = $this->w;
-		$h = $this->h;
-		$crop = $this->crop;
+    protected function get_target_sizes( $load_filename ) {
+        $image = wp_get_image_editor( $load_filename );
+        $w = $this->w;
+        $h = $this->h;
+        $crop = $this->crop;
 
-		$current_size = $image->get_size();
-		$src_w = $current_size['width'];
-		$src_h = $current_size['height'];
-		$src_ratio = $src_w / $src_h;
-		if ( !$h ) {
-			$h = round( $w / $src_ratio );
-		}
-		if ( !$w ) {
-			//the user wants to resize based on constant height
-			$w = round( $h * $src_ratio );
-		}
-		if ( !$crop ) {
-			return array(
-				'x' => 0, 'y' => 0,
-				'src_w' => $src_w, 'src_h' => $src_h,
-				'target_w' => $w, 'target_h' => $h
-			);
-		}
-		// Get ratios
-		$dest_ratio = $w / $h;
-		$src_wt = $src_h * $dest_ratio;
-		$src_ht = $src_w / $dest_ratio;
-		$src_x = $src_w / 2 - $src_wt / 2;
-		$src_y = ( $src_h - $src_ht ) / 6;
-		//now specific overrides based on options:
-		switch ( $crop ) {
-			case 'center':
-				// Get source x and y
-				$src_x = round( ( $src_w - $src_wt ) / 2 );
-				$src_y = round( ( $src_h - $src_ht ) / 2 );
-				break;
+        $current_size = $image->get_size();
+        $src_w = $current_size['width'];
+        $src_h = $current_size['height'];
+        $src_ratio = $src_w / $src_h;
+        if ( !$h ) {
+            $h = round( $w / $src_ratio );
+        }
+        if ( !$w ) {
+            //the user wants to resize based on constant height
+            $w = round( $h * $src_ratio );
+        }
+        if ( !$crop ) {
+            return array(
+                'x' => 0, 'y' => 0,
+                'src_w' => $src_w, 'src_h' => $src_h,
+                'target_w' => $w, 'target_h' => $h
+            );
+        }
+        // Get ratios
+        $dest_ratio = $w / $h;
+        $src_wt = $src_h * $dest_ratio;
+        $src_ht = $src_w / $dest_ratio;
+        $src_x = $src_w / 2 - $src_wt / 2;
+        $src_y = ( $src_h - $src_ht ) / 6;
+        //now specific overrides based on options:
+        switch ( $crop ) {
+            case 'center':
+                // Get source x and y
+                $src_x = round( ( $src_w - $src_wt ) / 2 );
+                $src_y = round( ( $src_h - $src_ht ) / 2 );
+                break;
 
-			case 'top':
-				$src_y = 0;
-				break;
+            case 'top':
+                $src_y = 0;
+                break;
 
-			case 'bottom':
-				$src_y = $src_h - $src_ht;
-				break;
+            case 'bottom':
+                $src_y = $src_h - $src_ht;
+                break;
 
-			case 'top-center':
-				$src_y = round( ( $src_h - $src_ht ) / 4 );
-				break;
+            case 'top-center':
+                $src_y = round( ( $src_h - $src_ht ) / 4 );
+                break;
 
-			case 'bottom-center':
-				$src_y = $src_h - $src_ht - round( ( $src_h - $src_ht ) / 4 );
-				break;
+            case 'bottom-center':
+                $src_y = $src_h - $src_ht - round( ( $src_h - $src_ht ) / 4 );
+                break;
 
-			case 'left':
-				$src_x = 0;
-				break;
+            case 'left':
+                $src_x = 0;
+                break;
 
-			case 'right':
-				$src_x = $src_w - $src_wt;
-				break;
-		}
-		// Crop the image
-		return ( $dest_ratio > $src_ratio )
-			? array(
-				'x' => 0, 'y' => $src_y,
-				'src_w' => $src_w, 'src_h' => $src_ht,
-				'target_w' => $w, 'target_h' => $h
-			)
-			: array(
-				'x' => $src_x, 'y' => 0,
-				'src_w' => $src_wt, 'src_h' => $src_h,
-				'target_w' => $w, 'target_h' => $h
-			);
-	}
+            case 'right':
+                $src_x = $src_w - $src_wt;
+                break;
+        }
+        // Crop the image
+        return ( $dest_ratio > $src_ratio )
+            ? array(
+                'x' => 0, 'y' => $src_y,
+                'src_w' => $src_w, 'src_h' => $src_ht,
+                'target_w' => $w, 'target_h' => $h
+            )
+            : array(
+                'x' => $src_x, 'y' => 0,
+                'src_w' => $src_wt, 'src_h' => $src_h,
+                'target_w' => $w, 'target_h' => $h
+            );
+    }
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 *
-	 * @param  string $load_filename filepath (not URL) to source file
-	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
-	 * @param  string $save_filename filepath (not URL) where result file should be saved
-	 *                               (ex: /src/var/www/wp-content/uploads/my-pic-300x200-c-default.jpg)
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	public function run($load_filename, $save_filename) {
-		//should be resized by gif resizer
-		if ( TimberImageHelper::is_animated_gif($load_filename) ) {
-			//attempt to resize
-			//return if successful
-			//proceed if not
-			$gif = self::run_animated_gif($load_filename, $save_filename);
-			if ($gif) {
-				return true;
-			}
-		}
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$crop = self::get_target_sizes( $load_filename );
-			$image->crop( 	$crop['x'],
-							$crop['y'],
-							$crop['src_w'],
-							$crop['src_h'],
-							$crop['target_w'],
-							$crop['target_h']
-			);
-			$result = $image->save( $save_filename );
-			if ( is_wp_error( $result ) ) {
-				// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
-				return false;
-				// @codeCoverageIgnoreEnd
-			} else {
-				return true;
-			}
-		} else if ( isset( $image->error_data['error_loading_image'] ) ) {
-			// @codeCoverageIgnoreStart
-			TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
-		} else {
-			TimberHelper::error_log( $image );
-			// @codeCoverageIgnoreEnd
-		}
-	}
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     *
+     * @param  string $load_filename filepath (not URL) to source file
+     *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
+     * @param  string $save_filename filepath (not URL) where result file should be saved
+     *                               (ex: /src/var/www/wp-content/uploads/my-pic-300x200-c-default.jpg)
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    public function run($load_filename, $save_filename) {
+        //should be resized by gif resizer
+        if ( TimberImageHelper::is_animated_gif($load_filename) ) {
+            //attempt to resize
+            //return if successful
+            //proceed if not
+            $gif = self::run_animated_gif($load_filename, $save_filename);
+            if ($gif) {
+                return true;
+            }
+        }
+        $image = wp_get_image_editor( $load_filename );
+        if ( !is_wp_error( $image ) ) {
+            $crop = self::get_target_sizes( $load_filename );
+            $image->crop( 	$crop['x'],
+                            $crop['y'],
+                            $crop['src_w'],
+                            $crop['src_h'],
+                            $crop['target_w'],
+                            $crop['target_h']
+            );
+            $result = $image->save( $save_filename );
+            if ( is_wp_error( $result ) ) {
+                // @codeCoverageIgnoreStart
+                TimberHelper::error_log( 'Error resizing image' );
+                TimberHelper::error_log( $result );
+                return false;
+                // @codeCoverageIgnoreEnd
+            } else {
+                return true;
+            }
+        } else if ( isset( $image->error_data['error_loading_image'] ) ) {
+            // @codeCoverageIgnoreStart
+            TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+        } else {
+            TimberHelper::error_log( $image );
+            // @codeCoverageIgnoreEnd
+        }
+    }
 }

lib/image/timber-image-operation-letterbox.php

Indentation +90 added lines, -90 removed lines

@@ -10,98 +10,98 @@
  */
 class TimberImageOperationLetterbox extends TimberImageOperation {
 
-	private $w, $h, $color;
+    private $w, $h, $color;
 
-	/**
-	 * @param int    $w     width of result image
-	 * @param int    $h     height
-	 * @param string $color hex string, for color of padding bands
-	 */
-	function __construct($w, $h, $color) {
-		$this->w = $w;
-		$this->h = $h;
-		$this->color = $color;
-	}
+    /**
+     * @param int    $w     width of result image
+     * @param int    $h     height
+     * @param string $color hex string, for color of padding bands
+     */
+    function __construct($w, $h, $color) {
+        $this->w = $w;
+        $this->h = $h;
+        $this->color = $color;
+    }
 
-	/**
-	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-	 * @param   string    $src_extension    the extension (ex: .jpg)
-	 * @return  string    the final filename to be used
-	 *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
-	 */
-	public function filename($src_filename, $src_extension) {
-		$color = str_replace( '#', '', $this->color );
-		$newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
-		$new_name = $newbase . '.' . $src_extension;
-		return $new_name;
-	}
+    /**
+     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+     * @param   string    $src_extension    the extension (ex: .jpg)
+     * @return  string    the final filename to be used
+     *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
+     */
+    public function filename($src_filename, $src_extension) {
+        $color = str_replace( '#', '', $this->color );
+        $newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
+        $new_name = $newbase . '.' . $src_extension;
+        return $new_name;
+    }
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 *
-	 * @param  string $load_filename filepath (not URL) to source file
-	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
-	 * @param  string $save_filename filepath (not URL) where result file should be saved
-	 *                               (ex: /src/var/www/wp-content/uploads/my-pic-lbox-300x200-FF3366.jpg)
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	public function run($load_filename, $save_filename) {
-		$w = $this->w;
-		$h = $this->h;
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     *
+     * @param  string $load_filename filepath (not URL) to source file
+     *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
+     * @param  string $save_filename filepath (not URL) where result file should be saved
+     *                               (ex: /src/var/www/wp-content/uploads/my-pic-lbox-300x200-FF3366.jpg)
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    public function run($load_filename, $save_filename) {
+        $w = $this->w;
+        $h = $this->h;
 
-		$bg = imagecreatetruecolor( $w, $h );
-		$c = self::hexrgb( $this->color );
-		$bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
-		imagefill( $bg, 0, 0, $bgColor );
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$current_size = $image->get_size();
-			$quality = $image->get_quality();
-			$ow = $current_size['width'];
-			$oh = $current_size['height'];
-			$new_aspect = $w / $h;
-			$old_aspect = $ow / $oh;
-			if ( $new_aspect > $old_aspect ) {
-				//taller than goal
-				$h_scale = $h / $oh;
-				$owt = $ow * $h_scale;
-				$y = 0;
-				$x = $w / 2 - $owt / 2;
-				$oht = $h;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
-			} else {
-				$w_scale = $w / $ow;
-				$oht = $oh * $w_scale;
-				$x = 0;
-				$y = $h / 2 - $oht / 2;
-				$owt = $w;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
-			}
-			$result = $image->save( $save_filename );
-			$func = 'imagecreatefromjpeg';
-			$save_func = 'imagejpeg';
-			$ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
-			if ( $ext == 'gif' ) {
-				$func = 'imagecreatefromgif';
-				$save_func = 'imagegif';
-			} else if ( $ext == 'png' ) {
-				$func = 'imagecreatefrompng';
-				$save_func = 'imagepng';
-				if ($quality > 9) {
-					$quality = $quality/10;
-					$quality = round(10 - $quality);
-				}
-			}
-			$image = $func( $save_filename );
-			imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
-			if ($save_func === 'imagegif') {
-				return $save_func( $bg, $save_filename );
-			}
-			return $save_func( $bg, $save_filename, $quality );
-		} else {
-			TimberHelper::error_log( $image );
-		}
-		return false;
-	}
+        $bg = imagecreatetruecolor( $w, $h );
+        $c = self::hexrgb( $this->color );
+        $bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
+        imagefill( $bg, 0, 0, $bgColor );
+        $image = wp_get_image_editor( $load_filename );
+        if ( !is_wp_error( $image ) ) {
+            $current_size = $image->get_size();
+            $quality = $image->get_quality();
+            $ow = $current_size['width'];
+            $oh = $current_size['height'];
+            $new_aspect = $w / $h;
+            $old_aspect = $ow / $oh;
+            if ( $new_aspect > $old_aspect ) {
+                //taller than goal
+                $h_scale = $h / $oh;
+                $owt = $ow * $h_scale;
+                $y = 0;
+                $x = $w / 2 - $owt / 2;
+                $oht = $h;
+                $image->crop( 0, 0, $ow, $oh, $owt, $oht );
+            } else {
+                $w_scale = $w / $ow;
+                $oht = $oh * $w_scale;
+                $x = 0;
+                $y = $h / 2 - $oht / 2;
+                $owt = $w;
+                $image->crop( 0, 0, $ow, $oh, $owt, $oht );
+            }
+            $result = $image->save( $save_filename );
+            $func = 'imagecreatefromjpeg';
+            $save_func = 'imagejpeg';
+            $ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
+            if ( $ext == 'gif' ) {
+                $func = 'imagecreatefromgif';
+                $save_func = 'imagegif';
+            } else if ( $ext == 'png' ) {
+                $func = 'imagecreatefrompng';
+                $save_func = 'imagepng';
+                if ($quality > 9) {
+                    $quality = $quality/10;
+                    $quality = round(10 - $quality);
+                }
+            }
+            $image = $func( $save_filename );
+            imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
+            if ($save_func === 'imagegif') {
+                return $save_func( $bg, $save_filename );
+            }
+            return $save_func( $bg, $save_filename, $quality );
+        } else {
+            TimberHelper::error_log( $image );
+        }
+        return false;
+    }
 }

lib/image/timber-image-operation-tojpg.php

Indentation +60 added lines, -60 removed lines

@@ -7,68 +7,68 @@
  */
 class TimberImageOperationToJpg extends TimberImageOperation {
 
-	private $color;
+    private $color;
 
-	/**
-	 * @param string $color hex string of color to use for transparent zones
-	 */
-	function __construct($color) {
-		$this->color = $color;
-	}
+    /**
+     * @param string $color hex string of color to use for transparent zones
+     */
+    function __construct($color) {
+        $this->color = $color;
+    }
 
-	/**
-	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-	 * @param   string    $src_extension    ignored
-	 * @return  string    the final filename to be used (ex: my-awesome-pic.jpg)
-	 */
-	function filename($src_filename, $src_extension = 'jpg') {
-		$new_name = $src_filename . '.jpg';
-		return $new_name;
-	}
+    /**
+     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+     * @param   string    $src_extension    ignored
+     * @return  string    the final filename to be used (ex: my-awesome-pic.jpg)
+     */
+    function filename($src_filename, $src_extension = 'jpg') {
+        $new_name = $src_filename . '.jpg';
+        return $new_name;
+    }
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 *
-	 * @param  string $load_filename filepath (not URL) to source file (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
-	 * @param  string $save_filename filepath (not URL) where result file should be saved
-	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.png)
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	function run($load_filename, $save_filename) {
-		$input = self::image_create( $load_filename );
-		list( $width, $height ) = getimagesize( $load_filename );
-		$output = imagecreatetruecolor( $width, $height );
-		$c = self::hexrgb( $this->color );
-		$color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
-		imagefilledrectangle( $output, 0, 0, $width, $height, $color );
-		imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
-		imagejpeg( $output, $save_filename );
-		return true;
-	}
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     *
+     * @param  string $load_filename filepath (not URL) to source file (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
+     * @param  string $save_filename filepath (not URL) where result file should be saved
+     *                               (ex: /src/var/www/wp-content/uploads/my-pic.png)
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    function run($load_filename, $save_filename) {
+        $input = self::image_create( $load_filename );
+        list( $width, $height ) = getimagesize( $load_filename );
+        $output = imagecreatetruecolor( $width, $height );
+        $c = self::hexrgb( $this->color );
+        $color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
+        imagefilledrectangle( $output, 0, 0, $width, $height, $color );
+        imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
+        imagejpeg( $output, $save_filename );
+        return true;
+    }
 
-	/**
-	 * @param string $filename
-	 * @return resource an image identifier representing the image obtained from the given filename
-	 *                  will return the same data type regardless of whether the source is gif or png
-	 */
-	function image_create( $filename, $ext = 'auto' ) {
-		if ( $ext == 'auto' ) {
-			$ext = wp_check_filetype($filename);
-			if (isset($ext['ext'])) {
-				$ext = $ext['ext'];
-			}
-		}
-		$ext = strtolower($ext);
-		if ( $ext == 'gif' ) {
-			return imagecreatefromgif($filename);
-		}
-		if ( $ext == 'png' ) {
-			return imagecreatefrompng($filename);
-		}
-		if ( $ext == 'jpg' || $ext == 'jpeg' ) {
-			return imagecreatefromjpeg($filename);
-		}
-		throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
-	}
+    /**
+     * @param string $filename
+     * @return resource an image identifier representing the image obtained from the given filename
+     *                  will return the same data type regardless of whether the source is gif or png
+     */
+    function image_create( $filename, $ext = 'auto' ) {
+        if ( $ext == 'auto' ) {
+            $ext = wp_check_filetype($filename);
+            if (isset($ext['ext'])) {
+                $ext = $ext['ext'];
+            }
+        }
+        $ext = strtolower($ext);
+        if ( $ext == 'gif' ) {
+            return imagecreatefromgif($filename);
+        }
+        if ( $ext == 'png' ) {
+            return imagecreatefrompng($filename);
+        }
+        if ( $ext == 'jpg' || $ext == 'jpeg' ) {
+            return imagecreatefromjpeg($filename);
+        }
+        throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
+    }
 }

lib/image/timber-image-operation.php

Indentation +43 added lines, -43 removed lines

@@ -1,49 +1,49 @@
 <?php
 /**
- * Each image filter is represented by a subclass of this class,m
- * and each filter call is a new instance, with call arguments as properties.
- * 
- * Only 3 methods need to be implemented:
- * - constructor, storing all filter arguments
- * - filename
- * - run
- */
+     * Each image filter is represented by a subclass of this class,m
+     * and each filter call is a new instance, with call arguments as properties.
+     * 
+     * Only 3 methods need to be implemented:
+     * - constructor, storing all filter arguments
+     * - filename
+     * - run
+     */
 abstract class TimberImageOperation {
-	/**
-	 * Builds the result filename, based on source filename and extension
-	 * 
-	 * @param  string $src_filename  source filename (excluding extension and path)
-	 * @param  string $src_extension source file extension
-	 * @return string                resulting filename (including extension but excluding path)
-	 *                               ex: my-awesome-file.jpg
-	 */
-	public abstract function filename($src_filename, $src_extension);
+    /**
+     * Builds the result filename, based on source filename and extension
+     * 
+     * @param  string $src_filename  source filename (excluding extension and path)
+     * @param  string $src_extension source file extension
+     * @return string                resulting filename (including extension but excluding path)
+     *                               ex: my-awesome-file.jpg
+     */
+    public abstract function filename($src_filename, $src_extension);
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 * 
-	 * @param  string $load_filename filepath (not URL) to source file
-	 * @param  string $save_filename filepath (not URL) where result file should be saved
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	public abstract function run($load_filename, $save_filename);
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     * 
+     * @param  string $load_filename filepath (not URL) to source file
+     * @param  string $save_filename filepath (not URL) where result file should be saved
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    public abstract function run($load_filename, $save_filename);
 
-	/**
-	 * Helper method to convert hex string to rgb array
-	 * 
-	 * @param  string $hexstr hex color string (like '#FF1455')
-	 * @return array          array('red', 'green', 'blue') to int
-	 *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85);
-	 */
-	public static function hexrgb( $hexstr ) {
-		if ( !strstr( $hexstr, '#' ) ) {
-			$hexstr = '#' . $hexstr;
-		}
-		if ( strlen( $hexstr ) == 4 ) {
-			$hexstr = '#' . $hexstr[1] . $hexstr[1] . $hexstr[2] . $hexstr[2] . $hexstr[3] . $hexstr[3];
-		}
-		$int = hexdec( $hexstr );
-		return array( "red" => 0xFF & ( $int >> 0x10 ), "green" => 0xFF & ( $int >> 0x8 ), "blue" => 0xFF & $int );
-	}
+    /**
+     * Helper method to convert hex string to rgb array
+     * 
+     * @param  string $hexstr hex color string (like '#FF1455')
+     * @return array          array('red', 'green', 'blue') to int
+     *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85);
+     */
+    public static function hexrgb( $hexstr ) {
+        if ( !strstr( $hexstr, '#' ) ) {
+            $hexstr = '#' . $hexstr;
+        }
+        if ( strlen( $hexstr ) == 4 ) {
+            $hexstr = '#' . $hexstr[1] . $hexstr[1] . $hexstr[2] . $hexstr[2] . $hexstr[3] . $hexstr[3];
+        }
+        $int = hexdec( $hexstr );
+        return array( "red" => 0xFF & ( $int >> 0x10 ), "green" => 0xFF & ( $int >> 0x8 ), "blue" => 0xFF & $int );
+    }
 }
\ No newline at end of file