| @@ -11,16 +11,16 @@ | ||
| 11 | 11 | * @return string | 
| 12 | 12 | */ | 
| 13 | 13 |  	public function generateKey($value) { | 
| 14 | -		if (is_a($value, 'TimberKeyGeneratorInterface')) { | |
| 14 | +		if ( is_a($value, 'TimberKeyGeneratorInterface') ) { | |
| 15 | 15 | return $value->_get_cache_key(); | 
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | -		if (is_array($value) && isset($value['_cache_key'])) { | |
| 18 | +		if ( is_array($value) && isset($value['_cache_key']) ) { | |
| 19 | 19 | return $value['_cache_key']; | 
| 20 | 20 | } | 
| 21 | 21 | |
| 22 | 22 | $key = md5(json_encode($value)); | 
| 23 | -		if (is_object($value)) { | |
| 23 | +		if ( is_object($value) ) { | |
| 24 | 24 | $key = get_class($value) . '|' . $key; | 
| 25 | 25 | } | 
| 26 | 26 | |
| @@ -30,7 +30,7 @@ discard block | ||
| 30 | 30 | * (ex: my-awesome-pic-lbox-300x200-FF3366.jpg) | 
| 31 | 31 | */ | 
| 32 | 32 |  	public function filename($src_filename, $src_extension) { | 
| 33 | - $color = str_replace( '#', '', $this->color ); | |
| 33 | +		$color = str_replace('#', '', $this->color); | |
| 34 | 34 | $newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color; | 
| 35 | 35 | $new_name = $newbase . '.' . $src_extension; | 
| 36 | 36 | return $new_name; | 
| @@ -50,12 +50,12 @@ discard block | ||
| 50 | 50 | $w = $this->w; | 
| 51 | 51 | $h = $this->h; | 
| 52 | 52 | |
| 53 | - $bg = imagecreatetruecolor( $w, $h ); | |
| 54 | - $c = self::hexrgb( $this->color ); | |
| 55 | - $bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] ); | |
| 56 | - imagefill( $bg, 0, 0, $bgColor ); | |
| 57 | - $image = wp_get_image_editor( $load_filename ); | |
| 58 | -		if ( !is_wp_error( $image ) ) { | |
| 53 | + $bg = imagecreatetruecolor($w, $h); | |
| 54 | + $c = self::hexrgb($this->color); | |
| 55 | + $bgColor = imagecolorallocate($bg, $c['red'], $c['green'], $c['blue']); | |
| 56 | + imagefill($bg, 0, 0, $bgColor); | |
| 57 | + $image = wp_get_image_editor($load_filename); | |
| 58 | +		if ( !is_wp_error($image) ) { | |
| 59 | 59 | $current_size = $image->get_size(); | 
| 60 | 60 | $quality = $image->get_quality(); | 
| 61 | 61 | $ow = $current_size['width']; | 
| @@ -69,29 +69,29 @@ discard block | ||
| 69 | 69 | $y = 0; | 
| 70 | 70 | $x = $w / 2 - $owt / 2; | 
| 71 | 71 | $oht = $h; | 
| 72 | - $image->crop( 0, 0, $ow, $oh, $owt, $oht ); | |
| 72 | + $image->crop(0, 0, $ow, $oh, $owt, $oht); | |
| 73 | 73 |  			} else { | 
| 74 | 74 | $w_scale = $w / $ow; | 
| 75 | 75 | $oht = $oh * $w_scale; | 
| 76 | 76 | $x = 0; | 
| 77 | 77 | $y = $h / 2 - $oht / 2; | 
| 78 | 78 | $owt = $w; | 
| 79 | - $image->crop( 0, 0, $ow, $oh, $owt, $oht ); | |
| 79 | + $image->crop(0, 0, $ow, $oh, $owt, $oht); | |
| 80 | 80 | } | 
| 81 | - $image->save( $save_filename ); | |
| 81 | + $image->save($save_filename); | |
| 82 | 82 | $func = 'imagecreatefromjpeg'; | 
| 83 | - $ext = pathinfo( $save_filename, PATHINFO_EXTENSION ); | |
| 83 | + $ext = pathinfo($save_filename, PATHINFO_EXTENSION); | |
| 84 | 84 |  			if ( $ext == 'gif' ) { | 
| 85 | 85 | $func = 'imagecreatefromgif'; | 
| 86 | 86 |  			} else if ( $ext == 'png' ) { | 
| 87 | 87 | $func = 'imagecreatefrompng'; | 
| 88 | 88 | } | 
| 89 | - $image = $func( $save_filename ); | |
| 90 | - imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht ); | |
| 91 | - imagejpeg( $bg, $save_filename, $quality ); | |
| 89 | + $image = $func($save_filename); | |
| 90 | + imagecopy($bg, $image, $x, $y, 0, 0, $owt, $oht); | |
| 91 | + imagejpeg($bg, $save_filename, $quality); | |
| 92 | 92 | return true; | 
| 93 | 93 |  		} else { | 
| 94 | - TimberHelper::error_log( $image ); | |
| 94 | + TimberHelper::error_log($image); | |
| 95 | 95 | } | 
| 96 | 96 | return false; | 
| 97 | 97 | } | 
| @@ -35,15 +35,15 @@ discard block | ||
| 35 | 35 | * (ex: /src/var/www/wp-content/uploads/my-pic.png) | 
| 36 | 36 | * @return bool true if everything went fine, false otherwise | 
| 37 | 37 | */ | 
| 38 | -	function run($load_filename, $save_filename){ | |
| 39 | - $input = self::image_create( $load_filename ); | |
| 40 | - list( $width, $height ) = getimagesize( $load_filename ); | |
| 41 | - $output = imagecreatetruecolor( $width, $height ); | |
| 42 | - $c = self::hexrgb( $this->color ); | |
| 43 | - $color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] ); | |
| 44 | - imagefilledrectangle( $output, 0, 0, $width, $height, $color ); | |
| 45 | - imagecopy( $output, $input, 0, 0, 0, 0, $width, $height ); | |
| 46 | - imagejpeg( $output, $save_filename ); | |
| 38 | +	function run($load_filename, $save_filename) { | |
| 39 | + $input = self::image_create($load_filename); | |
| 40 | + list($width, $height) = getimagesize($load_filename); | |
| 41 | + $output = imagecreatetruecolor($width, $height); | |
| 42 | + $c = self::hexrgb($this->color); | |
| 43 | + $color = imagecolorallocate($output, $c['red'], $c['green'], $c['blue']); | |
| 44 | + imagefilledrectangle($output, 0, 0, $width, $height, $color); | |
| 45 | + imagecopy($output, $input, 0, 0, 0, 0, $width, $height); | |
| 46 | + imagejpeg($output, $save_filename); | |
| 47 | 47 | return true; | 
| 48 | 48 | } | 
| 49 | 49 | |
| @@ -51,10 +51,10 @@ discard block | ||
| 51 | 51 | * @return resource an image identifier representing the image obtained from the given filename | 
| 52 | 52 | * will return the same data type regardless of whether the source is gif or png | 
| 53 | 53 | */ | 
| 54 | -	function image_create( $filename, $ext = 'auto' ) { | |
| 54 | +	function image_create($filename, $ext = 'auto') { | |
| 55 | 55 |  		if ( $ext == 'auto' ) { | 
| 56 | 56 | $ext = wp_check_filetype($filename); | 
| 57 | -			if (isset($ext['ext'])) { | |
| 57 | +			if ( isset($ext['ext']) ) { | |
| 58 | 58 | $ext = $ext['ext']; | 
| 59 | 59 | } | 
| 60 | 60 | } | 
| @@ -65,7 +65,7 @@ discard block | ||
| 65 | 65 |  		if ( $ext == 'png' ) { | 
| 66 | 66 | return imagecreatefrompng($filename); | 
| 67 | 67 | } | 
| 68 | -		if ( $ext == 'jpg' || $ext == 'jpeg') { | |
| 68 | +		if ( $ext == 'jpg' || $ext == 'jpeg' ) { | |
| 69 | 69 | return imagecreatefromjpeg($filename); | 
| 70 | 70 | } | 
| 71 | 71 | } | 
| @@ -1,13 +1,13 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Each image filter is represented by a subclass of this class,m | |
| 4 | - * and each filter call is a new instance, with call arguments as properties. | |
| 5 | - * | |
| 6 | - * Only 3 methods need to be implemented: | |
| 7 | - * - constructor, storing all filter arguments | |
| 8 | - * - filename | |
| 9 | - * - run | |
| 10 | - */ | |
| 3 | + * Each image filter is represented by a subclass of this class,m | |
| 4 | + * and each filter call is a new instance, with call arguments as properties. | |
| 5 | + * | |
| 6 | + * Only 3 methods need to be implemented: | |
| 7 | + * - constructor, storing all filter arguments | |
| 8 | + * - filename | |
| 9 | + * - run | |
| 10 | + */ | |
| 11 | 11 |  abstract class TimberImageOperation { | 
| 12 | 12 | /** | 
| 13 | 13 | * Builds the result filename, based on source filename and extension | 
| @@ -36,14 +36,14 @@ | ||
| 36 | 36 |  	 * @return array          array('red', 'green', 'blue') to int | 
| 37 | 37 |  	 *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85); | 
| 38 | 38 | */ | 
| 39 | -	public static function hexrgb( $hexstr ) { | |
| 40 | -		if ( !strstr( $hexstr, '#' ) ) { | |
| 39 | +	public static function hexrgb($hexstr) { | |
| 40 | +		if ( !strstr($hexstr, '#') ) { | |
| 41 | 41 | $hexstr = '#' . $hexstr; | 
| 42 | 42 | } | 
| 43 | -		if ( strlen( $hexstr ) == 4 ) { | |
| 43 | +		if ( strlen($hexstr) == 4 ) { | |
| 44 | 44 | $hexstr = '#' . $hexstr[1] . $hexstr[1] . $hexstr[2] . $hexstr[2] . $hexstr[3] . $hexstr[3]; | 
| 45 | 45 | } | 
| 46 | - $int = hexdec( $hexstr ); | |
| 47 | - return array( "red" => 0xFF & ( $int >> 0x10 ), "green" => 0xFF & ( $int >> 0x8 ), "blue" => 0xFF & $int ); | |
| 46 | + $int = hexdec($hexstr); | |
| 47 | +		return array("red" => 0xFF & ($int >> 0x10), "green" => 0xFF & ($int >> 0x8), "blue" => 0xFF & $int); | |
| 48 | 48 | } | 
| 49 | 49 | } | 
| 50 | 50 | \ No newline at end of file | 
| @@ -2,57 +2,57 @@ | ||
| 2 | 2 | |
| 3 | 3 |  class ACFTimber { | 
| 4 | 4 | |
| 5 | -    function __construct() { | |
| 6 | - add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 ); | |
| 7 | - add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 ); | |
| 8 | - add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 ); | |
| 9 | - add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 ); | |
| 10 | - add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 ); | |
| 11 | - add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 ); | |
| 12 | - } | |
| 13 | - | |
| 14 | -    function post_get_meta( $customs, $post_id ) { | |
| 15 | - return $customs; | |
| 16 | - } | |
| 17 | - | |
| 18 | -    function post_get_meta_field( $value, $post_id, $field_name ) { | |
| 19 | - return get_field( $field_name, $post_id ); | |
| 20 | - } | |
| 21 | - | |
| 22 | -    function term_get_meta_field( $value, $term_id, $field_name, $term ) { | |
| 23 | - $searcher = $term->taxonomy . "_" . $term->ID; | |
| 24 | - return get_field( $field_name, $searcher ); | |
| 25 | - } | |
| 26 | - | |
| 27 | -    function term_set_meta( $value, $field, $term_id, $term ) { | |
| 28 | - $searcher = $term->taxonomy . "_" . $term->ID; | |
| 29 | - update_field( $field, $value, $searcher ); | |
| 30 | - return $value; | |
| 31 | - } | |
| 32 | - | |
| 33 | -    function term_get_meta( $fields, $term_id, $term ) { | |
| 34 | - $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category | |
| 35 | - $fds = get_fields( $searcher ); | |
| 36 | -        if ( is_array( $fds ) ) { | |
| 37 | -            foreach ( $fds as $key => $value ) { | |
| 38 | - $key = preg_replace( '/_/', '', $key, 1 ); | |
| 39 | - $key = str_replace( $searcher, '', $key ); | |
| 40 | - $key = preg_replace( '/_/', '', $key, 1 ); | |
| 41 | - $field = get_field( $key, $searcher ); | |
| 42 | - $fields[$key] = $field; | |
| 43 | - } | |
| 44 | - $fields = array_merge( $fields, $fds ); | |
| 45 | - } | |
| 46 | - return $fields; | |
| 47 | - } | |
| 48 | - | |
| 49 | -    function user_get_meta( $fields, $user_id ) { | |
| 50 | - return $fields; | |
| 51 | - } | |
| 52 | - | |
| 53 | -    function user_get_meta_field( $value, $uid, $field ) { | |
| 54 | - return get_field( $field, 'user_' . $uid ); | |
| 55 | - } | |
| 5 | +	function __construct() { | |
| 6 | + add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 ); | |
| 7 | + add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 ); | |
| 8 | + add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 ); | |
| 9 | + add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 ); | |
| 10 | + add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 ); | |
| 11 | + add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 ); | |
| 12 | + } | |
| 13 | + | |
| 14 | +	function post_get_meta( $customs, $post_id ) { | |
| 15 | + return $customs; | |
| 16 | + } | |
| 17 | + | |
| 18 | +	function post_get_meta_field( $value, $post_id, $field_name ) { | |
| 19 | + return get_field( $field_name, $post_id ); | |
| 20 | + } | |
| 21 | + | |
| 22 | +	function term_get_meta_field( $value, $term_id, $field_name, $term ) { | |
| 23 | + $searcher = $term->taxonomy . "_" . $term->ID; | |
| 24 | + return get_field( $field_name, $searcher ); | |
| 25 | + } | |
| 26 | + | |
| 27 | +	function term_set_meta( $value, $field, $term_id, $term ) { | |
| 28 | + $searcher = $term->taxonomy . "_" . $term->ID; | |
| 29 | + update_field( $field, $value, $searcher ); | |
| 30 | + return $value; | |
| 31 | + } | |
| 32 | + | |
| 33 | +	function term_get_meta( $fields, $term_id, $term ) { | |
| 34 | + $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category | |
| 35 | + $fds = get_fields( $searcher ); | |
| 36 | +		if ( is_array( $fds ) ) { | |
| 37 | +			foreach ( $fds as $key => $value ) { | |
| 38 | + $key = preg_replace( '/_/', '', $key, 1 ); | |
| 39 | + $key = str_replace( $searcher, '', $key ); | |
| 40 | + $key = preg_replace( '/_/', '', $key, 1 ); | |
| 41 | + $field = get_field( $key, $searcher ); | |
| 42 | + $fields[$key] = $field; | |
| 43 | + } | |
| 44 | + $fields = array_merge( $fields, $fds ); | |
| 45 | + } | |
| 46 | + return $fields; | |
| 47 | + } | |
| 48 | + | |
| 49 | +	function user_get_meta( $fields, $user_id ) { | |
| 50 | + return $fields; | |
| 51 | + } | |
| 52 | + | |
| 53 | +	function user_get_meta_field( $value, $uid, $field ) { | |
| 54 | + return get_field( $field, 'user_' . $uid ); | |
| 55 | + } | |
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | 58 | |
| @@ -3,55 +3,55 @@ | ||
| 3 | 3 |  class ACFTimber { | 
| 4 | 4 | |
| 5 | 5 |      function __construct() { | 
| 6 | - add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 ); | |
| 7 | - add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 ); | |
| 8 | - add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 ); | |
| 9 | - add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 ); | |
| 10 | - add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 ); | |
| 11 | - add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 ); | |
| 6 | +        add_filter('timber_post_get_meta', array($this, 'post_get_meta'), 10, 2); | |
| 7 | +        add_filter('timber_post_get_meta_field', array($this, 'post_get_meta_field'), 10, 3); | |
| 8 | +        add_filter('timber_term_get_meta', array($this, 'term_get_meta'), 10, 3); | |
| 9 | +        add_filter('timber_term_get_meta_field', array($this, 'term_get_meta_field'), 10, 4); | |
| 10 | +        add_filter('timber_user_get_meta_field_pre', array($this, 'user_get_meta_field'), 10, 3); | |
| 11 | +        add_filter('timber_term_set_meta', array($this, 'term_set_meta'), 10, 4); | |
| 12 | 12 | } | 
| 13 | 13 | |
| 14 | -    function post_get_meta( $customs, $post_id ) { | |
| 14 | +    function post_get_meta($customs, $post_id) { | |
| 15 | 15 | return $customs; | 
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | -    function post_get_meta_field( $value, $post_id, $field_name ) { | |
| 19 | - return get_field( $field_name, $post_id ); | |
| 18 | +    function post_get_meta_field($value, $post_id, $field_name) { | |
| 19 | + return get_field($field_name, $post_id); | |
| 20 | 20 | } | 
| 21 | 21 | |
| 22 | -    function term_get_meta_field( $value, $term_id, $field_name, $term ) { | |
| 22 | +    function term_get_meta_field($value, $term_id, $field_name, $term) { | |
| 23 | 23 | $searcher = $term->taxonomy . "_" . $term->ID; | 
| 24 | - return get_field( $field_name, $searcher ); | |
| 24 | + return get_field($field_name, $searcher); | |
| 25 | 25 | } | 
| 26 | 26 | |
| 27 | -    function term_set_meta( $value, $field, $term_id, $term ) { | |
| 27 | +    function term_set_meta($value, $field, $term_id, $term) { | |
| 28 | 28 | $searcher = $term->taxonomy . "_" . $term->ID; | 
| 29 | - update_field( $field, $value, $searcher ); | |
| 29 | + update_field($field, $value, $searcher); | |
| 30 | 30 | return $value; | 
| 31 | 31 | } | 
| 32 | 32 | |
| 33 | -    function term_get_meta( $fields, $term_id, $term ) { | |
| 33 | +    function term_get_meta($fields, $term_id, $term) { | |
| 34 | 34 | $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category | 
| 35 | - $fds = get_fields( $searcher ); | |
| 36 | -        if ( is_array( $fds ) ) { | |
| 37 | -            foreach ( $fds as $key => $value ) { | |
| 38 | - $key = preg_replace( '/_/', '', $key, 1 ); | |
| 39 | - $key = str_replace( $searcher, '', $key ); | |
| 40 | - $key = preg_replace( '/_/', '', $key, 1 ); | |
| 41 | - $field = get_field( $key, $searcher ); | |
| 35 | + $fds = get_fields($searcher); | |
| 36 | +        if ( is_array($fds) ) { | |
| 37 | +            foreach ($fds as $key => $value) { | |
| 38 | +                $key = preg_replace('/_/', '', $key, 1); | |
| 39 | + $key = str_replace($searcher, '', $key); | |
| 40 | +                $key = preg_replace('/_/', '', $key, 1); | |
| 41 | + $field = get_field($key, $searcher); | |
| 42 | 42 | $fields[$key] = $field; | 
| 43 | 43 | } | 
| 44 | - $fields = array_merge( $fields, $fds ); | |
| 44 | + $fields = array_merge($fields, $fds); | |
| 45 | 45 | } | 
| 46 | 46 | return $fields; | 
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | -    function user_get_meta( $fields, $user_id ) { | |
| 49 | +    function user_get_meta($fields, $user_id) { | |
| 50 | 50 | return $fields; | 
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | -    function user_get_meta_field( $value, $uid, $field ) { | |
| 54 | - return get_field( $field, 'user_' . $uid ); | |
| 53 | +    function user_get_meta_field($value, $uid, $field) { | |
| 54 | + return get_field($field, 'user_' . $uid); | |
| 55 | 55 | } | 
| 56 | 56 | } | 
| 57 | 57 | |
| @@ -6,31 +6,31 @@ | ||
| 6 | 6 | */ | 
| 7 | 7 |  class TimberCommand { | 
| 8 | 8 | |
| 9 | -    public static function clear_cache($mode = 'all'){ | |
| 10 | -        if (is_array($mode)){ | |
| 11 | - $mode = reset($mode); | |
| 12 | - } | |
| 13 | -        if ($mode == 'all') { | |
| 14 | - $twig_cache = self::clear_cache_twig(); | |
| 15 | - $timber_cache = self::clear_cache_timber(); | |
| 16 | -            if ($twig_cache && $timber_cache){ | |
| 17 | - return true; | |
| 18 | - } | |
| 19 | -        } else if ($mode == 'twig') { | |
| 20 | - return self::clear_cache_twig(); | |
| 21 | -        } else if ($mode == 'timber') { | |
| 22 | - return self::clear_cache_timber(); | |
| 23 | - } | |
| 24 | - } | |
| 9 | +	public static function clear_cache($mode = 'all'){ | |
| 10 | +		if (is_array($mode)){ | |
| 11 | + $mode = reset($mode); | |
| 12 | + } | |
| 13 | +		if ($mode == 'all') { | |
| 14 | + $twig_cache = self::clear_cache_twig(); | |
| 15 | + $timber_cache = self::clear_cache_timber(); | |
| 16 | +			if ($twig_cache && $timber_cache){ | |
| 17 | + return true; | |
| 18 | + } | |
| 19 | +		} else if ($mode == 'twig') { | |
| 20 | + return self::clear_cache_twig(); | |
| 21 | +		} else if ($mode == 'timber') { | |
| 22 | + return self::clear_cache_timber(); | |
| 23 | + } | |
| 24 | + } | |
| 25 | 25 | |
| 26 | -    static function clear_cache_timber(){ | |
| 27 | - $loader = new TimberLoader(); | |
| 28 | - return $loader->clear_cache_timber(); | |
| 29 | - } | |
| 26 | +	static function clear_cache_timber(){ | |
| 27 | + $loader = new TimberLoader(); | |
| 28 | + return $loader->clear_cache_timber(); | |
| 29 | + } | |
| 30 | 30 | |
| 31 | -    static function clear_cache_twig(){ | |
| 32 | - $loader = new TimberLoader(); | |
| 33 | - return $loader->clear_cache_twig(); | |
| 34 | - } | |
| 31 | +	static function clear_cache_twig(){ | |
| 32 | + $loader = new TimberLoader(); | |
| 33 | + return $loader->clear_cache_twig(); | |
| 34 | + } | |
| 35 | 35 | |
| 36 | 36 | } | 
| @@ -6,29 +6,29 @@ | ||
| 6 | 6 | */ | 
| 7 | 7 |  class TimberCommand { | 
| 8 | 8 | |
| 9 | -    public static function clear_cache($mode = 'all'){ | |
| 10 | -        if (is_array($mode)){ | |
| 9 | +    public static function clear_cache($mode = 'all') { | |
| 10 | +        if ( is_array($mode) ) { | |
| 11 | 11 | $mode = reset($mode); | 
| 12 | 12 | } | 
| 13 | -        if ($mode == 'all') { | |
| 13 | +        if ( $mode == 'all' ) { | |
| 14 | 14 | $twig_cache = self::clear_cache_twig(); | 
| 15 | 15 | $timber_cache = self::clear_cache_timber(); | 
| 16 | -            if ($twig_cache && $timber_cache){ | |
| 16 | +            if ( $twig_cache && $timber_cache ) { | |
| 17 | 17 | return true; | 
| 18 | 18 | } | 
| 19 | -        } else if ($mode == 'twig') { | |
| 19 | +        } else if ( $mode == 'twig' ) { | |
| 20 | 20 | return self::clear_cache_twig(); | 
| 21 | -        } else if ($mode == 'timber') { | |
| 21 | +        } else if ( $mode == 'timber' ) { | |
| 22 | 22 | return self::clear_cache_timber(); | 
| 23 | 23 | } | 
| 24 | 24 | } | 
| 25 | 25 | |
| 26 | -    static function clear_cache_timber(){ | |
| 26 | +    static function clear_cache_timber() { | |
| 27 | 27 | $loader = new TimberLoader(); | 
| 28 | 28 | return $loader->clear_cache_timber(); | 
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | -    static function clear_cache_twig(){ | |
| 31 | +    static function clear_cache_twig() { | |
| 32 | 32 | $loader = new TimberLoader(); | 
| 33 | 33 | return $loader->clear_cache_twig(); | 
| 34 | 34 | } | 
| @@ -5,53 +5,53 @@ | ||
| 5 | 5 | |
| 6 | 6 |  class Timber_WP_CLI_Command extends WP_CLI_Command { | 
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * Clears Timber and Twig's Cache | |
| 10 | - * | |
| 11 | - * ## EXAMPLES | |
| 12 | - * | |
| 13 | - * wp timber clear_cache | |
| 14 | - * | |
| 15 | - */ | |
| 16 | -    public function clear_cache($mode = 'all') { | |
| 17 | - TimberCommand::clear_cache($mode); | |
| 18 | - } | |
| 8 | + /** | |
| 9 | + * Clears Timber and Twig's Cache | |
| 10 | + * | |
| 11 | + * ## EXAMPLES | |
| 12 | + * | |
| 13 | + * wp timber clear_cache | |
| 14 | + * | |
| 15 | + */ | |
| 16 | +	public function clear_cache($mode = 'all') { | |
| 17 | + TimberCommand::clear_cache($mode); | |
| 18 | + } | |
| 19 | 19 | |
| 20 | - /** | |
| 21 | - * Clears Twig's Cache | |
| 22 | - * | |
| 23 | - * ## EXAMPLES | |
| 24 | - * | |
| 25 | - * wp timber clear_cache_twig | |
| 26 | - * | |
| 27 | - */ | |
| 28 | -    function clear_cache_twig(){ | |
| 29 | - $clear = TimberCommand::clear_cache_twig(); | |
| 30 | -        if ($clear){ | |
| 31 | -            WP_CLI::success('Cleared contents of twig cache'); | |
| 32 | -        } else { | |
| 33 | -            WP_CLI::warning('Failed to clear twig cache'); | |
| 34 | - } | |
| 35 | - } | |
| 20 | + /** | |
| 21 | + * Clears Twig's Cache | |
| 22 | + * | |
| 23 | + * ## EXAMPLES | |
| 24 | + * | |
| 25 | + * wp timber clear_cache_twig | |
| 26 | + * | |
| 27 | + */ | |
| 28 | +	function clear_cache_twig(){ | |
| 29 | + $clear = TimberCommand::clear_cache_twig(); | |
| 30 | +		if ($clear){ | |
| 31 | +			WP_CLI::success('Cleared contents of twig cache'); | |
| 32 | +		} else { | |
| 33 | +			WP_CLI::warning('Failed to clear twig cache'); | |
| 34 | + } | |
| 35 | + } | |
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * Clears Timber's Cache | |
| 39 | - * | |
| 40 | - * ## EXAMPLES | |
| 41 | - * | |
| 42 | - * wp timber clear_cache_timber | |
| 43 | - * | |
| 44 | - */ | |
| 45 | -    function clear_cache_timber() { | |
| 46 | - $clear = TimberCommand::clear_cache_timber(); | |
| 47 | - $message = 'Failed to clear timber cache'; | |
| 48 | -        if ($clear){ | |
| 49 | - $message = "Cleared contents of Timber's Cache"; | |
| 50 | - WP_CLI::success($message); | |
| 51 | -        } else { | |
| 52 | - WP_CLI::warning($message); | |
| 53 | - } | |
| 54 | - return $message; | |
| 55 | - } | |
| 37 | + /** | |
| 38 | + * Clears Timber's Cache | |
| 39 | + * | |
| 40 | + * ## EXAMPLES | |
| 41 | + * | |
| 42 | + * wp timber clear_cache_timber | |
| 43 | + * | |
| 44 | + */ | |
| 45 | +	function clear_cache_timber() { | |
| 46 | + $clear = TimberCommand::clear_cache_timber(); | |
| 47 | + $message = 'Failed to clear timber cache'; | |
| 48 | +		if ($clear){ | |
| 49 | + $message = "Cleared contents of Timber's Cache"; | |
| 50 | + WP_CLI::success($message); | |
| 51 | +		} else { | |
| 52 | + WP_CLI::warning($message); | |
| 53 | + } | |
| 54 | + return $message; | |
| 55 | + } | |
| 56 | 56 | |
| 57 | 57 | } | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!class_exists('WP_CLI_Command')) { | |
| 2 | +if ( !class_exists('WP_CLI_Command') ) { | |
| 3 | 3 | return; | 
| 4 | 4 | } | 
| 5 | 5 | |
| @@ -25,9 +25,9 @@ discard block | ||
| 25 | 25 | * wp timber clear_cache_twig | 
| 26 | 26 | * | 
| 27 | 27 | */ | 
| 28 | -    function clear_cache_twig(){ | |
| 28 | +    function clear_cache_twig() { | |
| 29 | 29 | $clear = TimberCommand::clear_cache_twig(); | 
| 30 | -        if ($clear){ | |
| 30 | +        if ( $clear ) { | |
| 31 | 31 |              WP_CLI::success('Cleared contents of twig cache'); | 
| 32 | 32 |          } else { | 
| 33 | 33 |              WP_CLI::warning('Failed to clear twig cache'); | 
| @@ -45,7 +45,7 @@ discard block | ||
| 45 | 45 |      function clear_cache_timber() { | 
| 46 | 46 | $clear = TimberCommand::clear_cache_timber(); | 
| 47 | 47 | $message = 'Failed to clear timber cache'; | 
| 48 | -        if ($clear){ | |
| 48 | +        if ( $clear ) { | |
| 49 | 49 | $message = "Cleared contents of Timber's Cache"; | 
| 50 | 50 | WP_CLI::success($message); | 
| 51 | 51 |          } else { | 
| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | |
| 3 | 3 |  class TimberAdmin { | 
| 4 | 4 | |
| 5 | -    public static function init() { | |
| 6 | - return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 ); | |
| 7 | - } | |
| 5 | +	public static function init() { | |
| 6 | + return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 ); | |
| 7 | + } | |
| 8 | 8 | |
| 9 | 9 | /** | 
| 10 | 10 | * @param array $links | 
| @@ -3,7 +3,7 @@ discard block | ||
| 3 | 3 |  class TimberAdmin { | 
| 4 | 4 | |
| 5 | 5 |      public static function init() { | 
| 6 | - return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 ); | |
| 6 | +        return add_filter('plugin_row_meta', array(__CLASS__, 'meta_links'), 10, 2); | |
| 7 | 7 | } | 
| 8 | 8 | |
| 9 | 9 | /** | 
| @@ -11,8 +11,8 @@ discard block | ||
| 11 | 11 | * @param string $file | 
| 12 | 12 | * @return array | 
| 13 | 13 | */ | 
| 14 | -	public static function meta_links( $links, $file ) { | |
| 15 | -		if ( strstr( $file, '/timber.php' ) ) { | |
| 14 | +	public static function meta_links($links, $file) { | |
| 15 | +		if ( strstr($file, '/timber.php') ) { | |
| 16 | 16 | unset($links[2]); | 
| 17 | 17 | $links[] = '<a href="/wp-admin/plugin-install.php?tab=plugin-information&plugin=timber-library&TB_iframe=true&width=600&height=550" class="thickbox" aria-label="More information about Timber" data-title="Timber">View details</a>'; | 
| 18 | 18 | $links[] = '<a href="http://upstatement.com/timber" target="_blank">Homepage</a>'; | 
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | * } | 
| 55 | 55 | * @param string $base any additional paths that need to be prepended to the URLs that are generated, for example: "tags" | 
| 56 | 56 | */ | 
| 57 | -	function __construct( $args = null, $base = '' ) { | |
| 57 | +	function __construct($args = null, $base = '') { | |
| 58 | 58 | $this->init($args, $base); | 
| 59 | 59 | } | 
| 60 | 60 | |
| @@ -63,7 +63,7 @@ discard block | ||
| 63 | 63 | * @param array|string $args | 
| 64 | 64 | * @param string $base | 
| 65 | 65 | */ | 
| 66 | -	function init( $args = null, $base = '' ) { | |
| 66 | +	function init($args = null, $base = '') { | |
| 67 | 67 | $this->base = $base; | 
| 68 | 68 | $this->items = $this->get_items($args); | 
| 69 | 69 | } | 
| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 | * @param string $text | 
| 75 | 75 | * @return mixed | 
| 76 | 76 | */ | 
| 77 | -	protected function get_archives_link( $url, $text ) { | |
| 77 | +	protected function get_archives_link($url, $text) { | |
| 78 | 78 | $ret = array(); | 
| 79 | 79 | $ret['text'] = $ret['title'] = $ret['name'] = wptexturize($text); | 
| 80 | 80 | $ret['url'] = $ret['link'] = esc_url(TimberURLHelper::prepend_to_url($url, $this->base)); | 
| @@ -91,18 +91,18 @@ discard block | ||
| 91 | 91 | * @param string $limit | 
| 92 | 92 | * @return array | 
| 93 | 93 | */ | 
| 94 | -	protected function get_items_yearly( $args, $last_changed, $join, $where, $order, $limit ) { | |
| 94 | +	protected function get_items_yearly($args, $last_changed, $join, $where, $order, $limit) { | |
| 95 | 95 | global $wpdb; | 
| 96 | 96 | $output = array(); | 
| 97 | 97 |  		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM {$wpdb->posts} $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit"; | 
| 98 | 98 | $key = md5($query); | 
| 99 | 99 | $key = "wp_get_archives:$key:$last_changed"; | 
| 100 | -		if (!$results = wp_cache_get($key, 'posts')) { | |
| 100 | +		if ( !$results = wp_cache_get($key, 'posts') ) { | |
| 101 | 101 | $results = $wpdb->get_results($query); | 
| 102 | 102 | wp_cache_set($key, $results, 'posts'); | 
| 103 | 103 | } | 
| 104 | -		if ($results) { | |
| 105 | -			foreach ((array)$results as $result) { | |
| 104 | +		if ( $results ) { | |
| 105 | +			foreach ((array) $results as $result) { | |
| 106 | 106 | $url = get_year_link($result->year); | 
| 107 | 107 |  				$text = sprintf('%d', $result->year); | 
| 108 | 108 | $output[] = $this->get_archives_link($url, $text); | 
| @@ -122,7 +122,7 @@ discard block | ||
| 122 | 122 | * @param bool $nested | 
| 123 | 123 | * @return array | 
| 124 | 124 | */ | 
| 125 | -	protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) { | |
| 125 | +	protected function get_items_monthly($args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true) { | |
| 126 | 126 | global $wpdb, $wp_locale; | 
| 127 | 127 | $output = array(); | 
| 128 | 128 | $defaults = array( | 
| @@ -137,26 +137,26 @@ discard block | ||
| 137 | 137 | . "ORDER BY post_date $order $limit"; | 
| 138 | 138 | $key = md5($query); | 
| 139 | 139 | $key = "wp_get_archives:$key:$last_changed"; | 
| 140 | -		if (!$results = wp_cache_get($key, 'posts')) { | |
| 140 | +		if ( !$results = wp_cache_get($key, 'posts') ) { | |
| 141 | 141 | $results = $wpdb->get_results($query); | 
| 142 | 142 | wp_cache_set($key, $results, 'posts'); | 
| 143 | 143 | } | 
| 144 | -		if ($results) { | |
| 145 | -			foreach ((array)$results as $result) { | |
| 144 | +		if ( $results ) { | |
| 145 | +			foreach ((array) $results as $result) { | |
| 146 | 146 | $url = get_month_link($result->year, $result->month); | 
| 147 | -				if ($show_year && !$nested) { | |
| 147 | +				if ( $show_year && !$nested ) { | |
| 148 | 148 |  					$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year); | 
| 149 | 149 |  				} else { | 
| 150 | 150 |  					$text = sprintf(__('%1$s'), $wp_locale->get_month($result->month)); | 
| 151 | 151 | } | 
| 152 | -				if ($nested) { | |
| 152 | +				if ( $nested ) { | |
| 153 | 153 | $output[$result->year][] = $this->get_archives_link($url, $text); | 
| 154 | 154 |  				} else { | 
| 155 | 155 | $output[] = $this->get_archives_link($url, $text); | 
| 156 | 156 | } | 
| 157 | 157 | } | 
| 158 | 158 | } | 
| 159 | -		if ($nested) { | |
| 159 | +		if ( $nested ) { | |
| 160 | 160 | $out2 = array(); | 
| 161 | 161 |  			foreach ($output as $year => $months) { | 
| 162 | 162 |  				$out2[] = array('name' => $year, 'children' => $months); | 
| @@ -171,7 +171,7 @@ discard block | ||
| 171 | 171 | * @param array|string $args | 
| 172 | 172 | * @return array|string | 
| 173 | 173 | */ | 
| 174 | -	function get_items( $args = null ) { | |
| 174 | +	function get_items($args = null) { | |
| 175 | 175 | global $wpdb; | 
| 176 | 176 | |
| 177 | 177 | $defaults = array( | 
| @@ -220,7 +220,7 @@ discard block | ||
| 220 | 220 | $archive_week_start_date_format = 'Y/m/d'; | 
| 221 | 221 | $archive_week_end_date_format = 'Y/m/d'; | 
| 222 | 222 | |
| 223 | -		if (!$archive_date_format_over_ride) { | |
| 223 | +		if ( !$archive_date_format_over_ride ) { | |
| 224 | 224 |  			$archive_day_date_format = get_option('date_format'); | 
| 225 | 225 |  			$archive_week_start_date_format = get_option('date_format'); | 
| 226 | 226 |  			$archive_week_end_date_format = get_option('date_format'); | 
| @@ -232,7 +232,7 @@ discard block | ||
| 232 | 232 | |
| 233 | 233 | $output = array(); | 
| 234 | 234 |  		$last_changed = wp_cache_get('last_changed', 'posts'); | 
| 235 | -		if (!$last_changed) { | |
| 235 | +		if ( !$last_changed ) { | |
| 236 | 236 | $last_changed = microtime(); | 
| 237 | 237 |  			wp_cache_set('last_changed', $last_changed, 'posts'); | 
| 238 | 238 | } | 
| @@ -242,7 +242,7 @@ discard block | ||
| 242 | 242 | $output = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit); | 
| 243 | 243 |  		} elseif ( 'monthly-nested' == $type ) { | 
| 244 | 244 | $years = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit); | 
| 245 | -			foreach ( $years as &$year ) { | |
| 245 | +			foreach ($years as &$year) { | |
| 246 | 246 |  				$args = array('show_year' => false); | 
| 247 | 247 | $year['children'] = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit); | 
| 248 | 248 | } | 
| @@ -251,14 +251,14 @@ discard block | ||
| 251 | 251 | $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit"; | 
| 252 | 252 | $key = md5($query); | 
| 253 | 253 | $key = "wp_get_archives:$key:$last_changed"; | 
| 254 | -			if (!$results = wp_cache_get($key, 'posts')) { | |
| 254 | +			if ( !$results = wp_cache_get($key, 'posts') ) { | |
| 255 | 255 | $results = $wpdb->get_results($query); | 
| 256 | 256 | $cache = array(); | 
| 257 | 257 | $cache[$key] = $results; | 
| 258 | 258 | wp_cache_set($key, $results, 'posts'); | 
| 259 | 259 | } | 
| 260 | 260 |  			if ( $results ) { | 
| 261 | -				foreach ( (array)$results as $result ) { | |
| 261 | +				foreach ((array) $results as $result) { | |
| 262 | 262 | $url = get_day_link($result->year, $result->month, $result->dayofmonth); | 
| 263 | 263 |  					$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth); | 
| 264 | 264 | $text = mysql2date($archive_day_date_format, $date); | 
| @@ -271,13 +271,13 @@ discard block | ||
| 271 | 271 | . "count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit"; | 
| 272 | 272 | $key = md5($query); | 
| 273 | 273 | $key = "wp_get_archives:$key:$last_changed"; | 
| 274 | -			if (!$results = wp_cache_get($key, 'posts')) { | |
| 274 | +			if ( !$results = wp_cache_get($key, 'posts') ) { | |
| 275 | 275 | $results = $wpdb->get_results($query); | 
| 276 | 276 | wp_cache_set($key, $results, 'posts'); | 
| 277 | 277 | } | 
| 278 | 278 | $arc_w_last = ''; | 
| 279 | 279 |  			if ( $results ) { | 
| 280 | -				foreach ( (array)$results as $result ) { | |
| 280 | +				foreach ((array) $results as $result) { | |
| 281 | 281 |  					if ( $result->week != $arc_w_last ) { | 
| 282 | 282 | $arc_year = $result->yr; | 
| 283 | 283 | $arc_w_last = $result->week; | 
| @@ -300,10 +300,10 @@ discard block | ||
| 300 | 300 | wp_cache_set($key, $results, 'posts'); | 
| 301 | 301 | } | 
| 302 | 302 |  			if ( $results ) { | 
| 303 | -				foreach ( (array)$results as $result ) { | |
| 304 | -					if ($result->post_date != '0000-00-00 00:00:00') { | |
| 303 | +				foreach ((array) $results as $result) { | |
| 304 | +					if ( $result->post_date != '0000-00-00 00:00:00' ) { | |
| 305 | 305 | $url = get_permalink($result); | 
| 306 | -						if ($result->post_title) { | |
| 306 | +						if ( $result->post_title ) { | |
| 307 | 307 | /** This filter is documented in wp-includes/post-template.php */ | 
| 308 | 308 |  							$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID)); | 
| 309 | 309 |  						} else { |