| @@ -1,64 +1,62 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | 3 | /** |
| 7 | - * A fully static class to manage strings translations on admin side | |
| 4 | + * a fully static class to manage strings translations on admin side | |
| 8 | 5 | * |
| 9 | 6 | * @since 1.6 |
| 10 | 7 | */ |
| 11 | 8 | class PLL_Admin_Strings { |
| 12 | - protected static $strings = array(); // strings to translate | |
| 13 | - protected static $default_strings; // default strings to register | |
| 9 | + static protected $strings = array(); // strings to translate | |
| 10 | + static protected $default_strings; // default strings to register | |
| 14 | 11 | |
| 15 | 12 | /** |
| 16 | - * Add filters | |
| 13 | + * init: add filters | |
| 17 | 14 | * |
| 18 | 15 | * @since 1.6 |
| 19 | 16 | */ |
| 20 | - public static function init() { | |
| 17 | + static public function init() { | |
| 21 | 18 | // default strings translations sanitization |
| 22 | 19 | add_filter( 'pll_sanitize_string_translation', array( __CLASS__, 'sanitize_string_translation' ), 10, 2 ); |
| 23 | 20 | } |
| 24 | 21 | |
| 25 | 22 | /** |
| 26 | - * Register strings for translation making sure it is not duplicate or empty | |
| 23 | + * register strings for translation making sure it is not duplicate or empty | |
| 27 | 24 | * |
| 28 | 25 | * @since 0.6 |
| 29 | 26 | * |
| 30 | - * @param string $name A unique name for the string | |
| 31 | - * @param string $string The string to register | |
| 32 | - * @param string $context Optional, the group in which the string is registered, defaults to 'polylang' | |
| 33 | - * @param bool $multiline Optional, whether the string table should display a multiline textarea or a single line input, defaults to single line | |
| 27 | + * @param string $name a unique name for the string | |
| 28 | + * @param string $string the string to register | |
| 29 | + * @param string $context optional the group in which the string is registered, defaults to 'polylang' | |
| 30 | + * @param bool $multiline optional wether the string table should display a multiline textarea or a single line input, defaults to single line | |
| 34 | 31 | */ |
| 35 | - public static function register_string( $name, $string, $context = 'Polylang', $multiline = false ) { | |
| 36 | - // Backward compatibility with Polylang older than 1.1 | |
| 32 | + static public function register_string( $name, $string, $context = 'Polylang', $multiline = false ) { | |
| 33 | + // backward compatibility with Polylang older than 1.1 | |
| 37 | 34 | if ( is_bool( $context ) ) { |
| 38 | 35 | $multiline = $context; |
| 39 | 36 | $context = 'Polylang'; |
| 40 | 37 | } |
| 41 | 38 | |
| 42 | - if ( $string && is_scalar( $string ) ) { | |
| 43 | - self::$strings[ md5( $string ) ] = compact( 'name', 'string', 'context', 'multiline' ); | |
| 39 | + $to_register = compact( 'name', 'string', 'context', 'multiline' ); | |
| 40 | + if ( ! in_array( $to_register, self::$strings ) && $to_register['string'] ) { | |
| 41 | + self::$strings[] = $to_register; | |
| 44 | 42 | } |
| 45 | 43 | } |
| 46 | 44 | |
| 47 | 45 | /** |
| 48 | - * Get registered strings | |
| 46 | + * get registered strings | |
| 49 | 47 | * |
| 50 | 48 | * @since 0.6.1 |
| 51 | 49 | * |
| 52 | 50 | * @return array list of all registered strings |
| 53 | 51 | */ |
| 54 | - public static function &get_strings() { | |
| 52 | + static public function &get_strings() { | |
| 55 | 53 | self::$default_strings = array( |
| 56 | 54 | 'options' => array( |
| 57 | - 'blogname' => __( 'Site Title', 'polylang' ), | |
| 58 | - 'blogdescription' => __( 'Tagline', 'polylang' ), | |
| 59 | - 'date_format' => __( 'Date Format', 'polylang' ), | |
| 60 | - 'time_format' => __( 'Time Format', 'polylang' ), | |
| 55 | + 'blogname' => __( 'Site Title' ), | |
| 56 | + 'blogdescription' => __( 'Tagline' ), | |
| 57 | + 'date_format' => __( 'Date Format' ), | |
| 58 | + 'time_format' => __( 'Time Format' ), | |
| 61 | 59 | ), |
| 62 | 60 | 'widget_title' => __( 'Widget title', 'polylang' ), |
| 63 | 61 | 'widget_text' => __( 'Widget text', 'polylang' ), |
| 64 | 62 | ); |
| @@ -67,9 +65,9 @@ | ||
| 67 | 65 | foreach ( self::$default_strings['options'] as $option => $string ) { |
| 68 | 66 | self::register_string( $string, get_option( $option ), 'WordPress' ); |
| 69 | 67 | } |
| 70 | 68 | |
| 71 | - // Widgets titles | |
| 69 | + // widgets titles | |
| 72 | 70 | global $wp_registered_widgets; |
| 73 | 71 | $sidebars = wp_get_sidebars_widgets(); |
| 74 | 72 | foreach ( $sidebars as $sidebar => $widgets ) { |
| 75 | 73 | if ( 'wp_inactive_widgets' == $sidebar || empty( $widgets ) ) { |
| @@ -76,10 +74,10 @@ | ||
| 76 | 74 | continue; |
| 77 | 75 | } |
| 78 | 76 | |
| 79 | 77 | foreach ( $widgets as $widget ) { |
| 80 | - // Nothing can be done if the widget is created using pre WP2.8 API :( | |
| 81 | - // There is no object, so we can't access it to get the widget options | |
| 78 | + // nothing can be done if the widget is created using pre WP2.8 API :( | |
| 79 | + // there is no object, so we can't access it to get the widget options | |
| 82 | 80 | if ( ! isset( $wp_registered_widgets[ $widget ]['callback'][0] ) || ! is_object( $wp_registered_widgets[ $widget ]['callback'][0] ) || ! method_exists( $wp_registered_widgets[ $widget ]['callback'][0], 'get_settings' ) ) { |
| 83 | 81 | continue; |
| 84 | 82 | } |
| 85 | 83 | |
| @@ -85,9 +83,9 @@ | ||
| 85 | 83 | |
| 86 | 84 | $widget_settings = $wp_registered_widgets[ $widget ]['callback'][0]->get_settings(); |
| 87 | 85 | $number = $wp_registered_widgets[ $widget ]['params'][0]['number']; |
| 88 | 86 | |
| 89 | - // Don't enable widget translation if the widget is visible in only one language or if there is no title | |
| 87 | + // don't enable widget translation if the widget is visible in only one language or if there is no title | |
| 90 | 88 | if ( empty( $widget_settings[ $number ]['pll_lang'] ) ) { |
| 91 | 89 | if ( isset( $widget_settings[ $number ]['title'] ) && $title = $widget_settings[ $number ]['title'] ) { |
| 92 | 90 | self::register_string( self::$default_strings['widget_title'], $title, 'Widget' ); |
| 93 | 91 | } |
| @@ -111,9 +109,9 @@ | ||
| 111 | 109 | return self::$strings; |
| 112 | 110 | } |
| 113 | 111 | |
| 114 | 112 | /** |
| 115 | - * Performs the sanitization ( before saving in DB ) of default strings translations | |
| 113 | + * performs the sanitization ( before saving in DB ) of default strings translations | |
| 116 | 114 | * |
| 117 | 115 | * @since 1.6 |
| 118 | 116 | * |
| 119 | 117 | * @param string $translation translation to sanitize |
| @@ -119,9 +117,10 @@ | ||
| 119 | 117 | * @param string $translation translation to sanitize |
| 120 | 118 | * @param string $name unique name for the string |
| 121 | 119 | * @return string |
| 122 | 120 | */ |
| 123 | - public static function sanitize_string_translation( $translation, $name ) { | |
| 121 | + static public function sanitize_string_translation( $translation, $name ) { | |
| 122 | + $translation = wp_unslash( trim( $translation ) ); | |
| 124 | 123 | |
| 125 | 124 | if ( false !== ( $option = array_search( $name, self::$default_strings['options'], true ) ) ) { |
| 126 | 125 | $translation = sanitize_option( $option, $translation ); |
| 127 | 126 | } |
| @@ -126,13 +125,13 @@ | ||
| 126 | 125 | $translation = sanitize_option( $option, $translation ); |
| 127 | 126 | } |
| 128 | 127 | |
| 129 | 128 | if ( $name == self::$default_strings['widget_title'] ) { |
| 130 | - $translation = sanitize_text_field( $translation ); | |
| 129 | + $translation = strip_tags( $translation ); | |
| 131 | 130 | } |
| 132 | 131 | |
| 133 | 132 | if ( $name == self::$default_strings['widget_text'] && ! current_user_can( 'unfiltered_html' ) ) { |
| 134 | - $translation = wp_kses_post( $translation ); | |
| 133 | + $translation = wp_unslash( wp_filter_post_kses( addslashes( $translation ) ) ); // wp_filter_post_kses() expects slashed | |
| 135 | 134 | } |
| 136 | 135 | |
| 137 | 136 | return $translation; |
| 138 | 137 | } |
