@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | if ($nodesWithStyleAttributes !== false) { |
| 239 | 239 | /** @var $nodeWithStyleAttribute DOMNode */ |
| 240 | 240 | foreach ($nodesWithStyleAttributes as $node) { |
| 241 | - $normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') ); |
|
| 241 | + $normalizedOriginalStyle = preg_replace_callback('/[A-z\\-]+(?=\\:)/S', array($this, 'strtolower'), $node->getAttribute('style')); |
|
| 242 | 242 | |
| 243 | 243 | // in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles |
| 244 | 244 | $nodePath = $node->getNodePath(); |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | // now sort the selectors by precedence |
| 292 | - usort($allSelectors, array($this,'sortBySelectorPrecedence')); |
|
| 292 | + usort($allSelectors, array($this, 'sortBySelectorPrecedence')); |
|
| 293 | 293 | |
| 294 | 294 | $this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors; |
| 295 | 295 | } |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | if ($nodesWithStyleDisplayNone->length > 0) { |
| 330 | 330 | /** @var $node \DOMNode */ |
| 331 | 331 | foreach ($nodesWithStyleDisplayNone as $node) { |
| 332 | - if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) { |
|
| 332 | + if ($node->parentNode && is_callable(array($node->parentNode, 'removeChild'))) { |
|
| 333 | 333 | $node->parentNode->removeChild($node); |
| 334 | 334 | } |
| 335 | 335 | } |
@@ -338,10 +338,10 @@ discard block |
||
| 338 | 338 | $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument); |
| 339 | 339 | |
| 340 | 340 | if ($this->preserveEncoding) { |
| 341 | - if ( function_exists( 'mb_convert_encoding' ) ) { |
|
| 342 | - return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' ); |
|
| 341 | + if (function_exists('mb_convert_encoding')) { |
|
| 342 | + return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES'); |
|
| 343 | 343 | } else { |
| 344 | - return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) ); |
|
| 344 | + return htmlspecialchars_decode(utf8_encode(html_entity_decode($xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING))); |
|
| 345 | 345 | } |
| 346 | 346 | } else { |
| 347 | 347 | return $xmlDocument->saveHTML(); |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | * @return array |
| 463 | 463 | */ |
| 464 | 464 | private function splitCssAndMediaQuery($css) { |
| 465 | - $css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css ); |
|
| 465 | + $css = preg_replace_callback('#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array($this, '_media_concat'), $css); |
|
| 466 | 466 | |
| 467 | 467 | // filter the CSS |
| 468 | 468 | $search = array( |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | return array('css' => $css, 'media' => self::$_media); |
| 487 | 487 | } |
| 488 | 488 | |
| 489 | - private function _media_concat( $matches ) { |
|
| 489 | + private function _media_concat($matches) { |
|
| 490 | 490 | self::$_media .= $matches[0]; |
| 491 | 491 | } |
| 492 | 492 | |
@@ -524,10 +524,10 @@ discard block |
||
| 524 | 524 | $bodyWithoutUnprocessableTags = $this->html; |
| 525 | 525 | } |
| 526 | 526 | |
| 527 | - if ( function_exists( 'mb_convert_encoding' ) ) { |
|
| 528 | - return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING ); |
|
| 527 | + if (function_exists('mb_convert_encoding')) { |
|
| 528 | + return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING); |
|
| 529 | 529 | } else { |
| 530 | - return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) ); |
|
| 530 | + return htmlspecialchars_decode(utf8_decode(htmlentities($bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false))); |
|
| 531 | 531 | } |
| 532 | 532 | } |
| 533 | 533 | |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | $precedence = 0; |
| 563 | 563 | $value = 100; |
| 564 | 564 | // ids: worth 100, classes: worth 10, elements: worth 1 |
| 565 | - $search = array('\\#','\\.',''); |
|
| 565 | + $search = array('\\#', '\\.', ''); |
|
| 566 | 566 | |
| 567 | 567 | foreach ($search as $s) { |
| 568 | 568 | if (trim($selector == '')) { |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | */ |
| 591 | 591 | private function translateCssToXpath($paramCssSelector) { |
| 592 | 592 | $cssSelector = ' ' . $paramCssSelector . ' '; |
| 593 | - $cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector ); |
|
| 593 | + $cssSelector = preg_replace_callback('/\s+\w+\s+/', array($this, 'strtolower'), $cssSelector); |
|
| 594 | 594 | $cssSelector = trim($cssSelector); |
| 595 | 595 | $xpathKey = md5($cssSelector); |
| 596 | 596 | if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) { |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | * @return array |
| 714 | 714 | */ |
| 715 | 715 | private function parseNth(array $match) { |
| 716 | - if (in_array(strtolower($match[2]), array('even','odd'))) { |
|
| 716 | + if (in_array(strtolower($match[2]), array('even', 'odd'))) { |
|
| 717 | 717 | $index = strtolower($match[2]) == 'even' ? 0 : 1; |
| 718 | 718 | return array(self::MULTIPLIER => 2, self::INDEX => $index); |
| 719 | 719 | } elseif (stripos($match[2], 'n') === false) { |
@@ -22,14 +22,14 @@ discard block |
||
| 22 | 22 | 'block-output' => array( // the block visual output elements as an array |
| 23 | 23 | array( |
| 24 | 24 | 'element' => 'p', |
| 25 | - 'content' => __('A Google API key is required to use this block, we recommend installing our plugin which makes it easy and sets it globally, or you can set a key in the block settings sidebar: ','super-duper'), |
|
| 25 | + 'content' => __('A Google API key is required to use this block, we recommend installing our plugin which makes it easy and sets it globally, or you can set a key in the block settings sidebar: ', 'super-duper'), |
|
| 26 | 26 | //'element_require' => '"1"=='.get_option( 'rgmk_google_map_api_key', '"0"') ? '"0"' : '"1"', |
| 27 | - 'element_require' => get_option( 'rgmk_google_map_api_key', false) ? '1==0' : '1==1 && [%api_key%]==""', |
|
| 27 | + 'element_require' => get_option('rgmk_google_map_api_key', false) ? '1==0' : '1==1 && [%api_key%]==""', |
|
| 28 | 28 | ), |
| 29 | 29 | array( |
| 30 | 30 | 'element' => 'a', |
| 31 | - 'content' => __('API KEY for Google Maps','super-duper'), |
|
| 32 | - 'element_require' => get_option( 'rgmk_google_map_api_key', false) ? '1==0' : '1==1 && [%api_key%]==""', |
|
| 31 | + 'content' => __('API KEY for Google Maps', 'super-duper'), |
|
| 32 | + 'element_require' => get_option('rgmk_google_map_api_key', false) ? '1==0' : '1==1 && [%api_key%]==""', |
|
| 33 | 33 | 'href' => 'https://wordpress.org/plugins/api-key-for-google-maps/', |
| 34 | 34 | ), |
| 35 | 35 | array( |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | 'class' => '[%className%]', |
| 38 | 38 | //'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%] |
| 39 | 39 | 'element_require' => '[%type%]=="image"', |
| 40 | - 'src' => get_option( 'rgmk_google_map_api_key', false) ? "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=".get_option( 'rgmk_google_map_api_key') : "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=[%api_key%]" |
|
| 40 | + 'src' => get_option('rgmk_google_map_api_key', false) ? "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=" . get_option('rgmk_google_map_api_key') : "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=[%api_key%]" |
|
| 41 | 41 | ), |
| 42 | 42 | array( |
| 43 | 43 | 'element' => 'div', |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | 'style' => '{overflow:"hidden", position:"relative"}', |
| 46 | 46 | array( |
| 47 | 47 | 'element' => 'iframe', |
| 48 | - 'title' => __( 'Placeholderx', 'super-duper' ), |
|
| 48 | + 'title' => __('Placeholderx', 'super-duper'), |
|
| 49 | 49 | 'class' => '[%className%]', |
| 50 | 50 | 'width' => '[%width%]', |
| 51 | 51 | 'height' => '[%height%]', |
@@ -53,12 +53,12 @@ discard block |
||
| 53 | 53 | 'allowfullscreen' => 'true', |
| 54 | 54 | 'style' => '{border:0}', |
| 55 | 55 | 'element_require' => '[%type%]!="image"', |
| 56 | - 'src' => get_option( 'rgmk_google_map_api_key', false) ? "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=".get_option( 'rgmk_google_map_api_key') : "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=[%api_key%]" |
|
| 56 | + 'src' => get_option('rgmk_google_map_api_key', false) ? "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=" . get_option('rgmk_google_map_api_key') : "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=[%api_key%]" |
|
| 57 | 57 | ), |
| 58 | 58 | ), |
| 59 | 59 | array( |
| 60 | 60 | 'element' => 'style', |
| 61 | - 'content' => '.sd-map-iframe-cover:hover:before {background: #4a4a4a88; content: "'.__("Click here, Settings are in the block settings sidebar","super-duper").'";} .sd-map-iframe-cover:before{cursor: pointer; content: ""; width: 100%; height: 100%; position: absolute; top: 0; bottom: 0;padding-top: 33%; text-align: center; color: #fff; font-size: 20px; font-weight: bold;}', |
|
| 61 | + 'content' => '.sd-map-iframe-cover:hover:before {background: #4a4a4a88; content: "' . __("Click here, Settings are in the block settings sidebar", "super-duper") . '";} .sd-map-iframe-cover:before{cursor: pointer; content: ""; width: 100%; height: 100%; position: absolute; top: 0; bottom: 0;padding-top: 33%; text-align: center; color: #fff; font-size: 20px; font-weight: bold;}', |
|
| 62 | 62 | 'element_require' => '[%type%]!="image"', |
| 63 | 63 | ), |
| 64 | 64 | ), |
@@ -66,12 +66,12 @@ discard block |
||
| 66 | 66 | // The calling class name |
| 67 | 67 | 'base_id' => 'sd_map', |
| 68 | 68 | // this is used as the widget id and the shortcode id. |
| 69 | - 'name' => __( 'Map', 'super-duper' ), |
|
| 69 | + 'name' => __('Map', 'super-duper'), |
|
| 70 | 70 | // the name of the widget/block |
| 71 | 71 | 'widget_ops' => array( |
| 72 | 72 | 'classname' => 'sd-map-class', |
| 73 | 73 | // widget class |
| 74 | - 'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ), |
|
| 74 | + 'description' => esc_html__('This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world'), |
|
| 75 | 75 | // widget description |
| 76 | 76 | ), |
| 77 | 77 | 'arguments' => array( // these are the arguments that will be used in the widget, shortcode and block settings. |
@@ -93,8 +93,8 @@ discard block |
||
| 93 | 93 | ), |
| 94 | 94 | 'location' => array( |
| 95 | 95 | 'type' => 'text', |
| 96 | - 'title' => __( 'Location:', 'geodirectory' ), |
|
| 97 | - 'desc' => __( 'Enter the location to show on the map, place, city, zip code or GPS.', 'geodirectory' ), |
|
| 96 | + 'title' => __('Location:', 'geodirectory'), |
|
| 97 | + 'desc' => __('Enter the location to show on the map, place, city, zip code or GPS.', 'geodirectory'), |
|
| 98 | 98 | 'placeholder' => 'Place, city, zip code or GPS', |
| 99 | 99 | 'desc_tip' => true, |
| 100 | 100 | 'default' => 'Ireland', |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | ), |
| 103 | 103 | 'static_width' => array( |
| 104 | 104 | 'type' => 'number', |
| 105 | - 'title' => __( 'Width:', 'geodirectory' ), |
|
| 106 | - 'desc' => __( 'This is the width of the map, for static maps you can only use px values.', 'geodirectory' ), |
|
| 105 | + 'title' => __('Width:', 'geodirectory'), |
|
| 106 | + 'desc' => __('This is the width of the map, for static maps you can only use px values.', 'geodirectory'), |
|
| 107 | 107 | 'placeholder' => '600', |
| 108 | 108 | 'desc_tip' => true, |
| 109 | 109 | 'default' => '600', |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | ), |
| 117 | 117 | 'static_height' => array( |
| 118 | 118 | 'type' => 'number', |
| 119 | - 'title' => __( 'Height:', 'geodirectory' ), |
|
| 120 | - 'desc' => __( 'This is the height of the map, for static maps you can only use px values.', 'geodirectory' ), |
|
| 119 | + 'title' => __('Height:', 'geodirectory'), |
|
| 120 | + 'desc' => __('This is the height of the map, for static maps you can only use px values.', 'geodirectory'), |
|
| 121 | 121 | 'placeholder' => '400', |
| 122 | 122 | 'desc_tip' => true, |
| 123 | 123 | 'default' => '400', |
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | ), |
| 132 | 132 | 'width' => array( |
| 133 | 133 | 'type' => 'text', |
| 134 | - 'title' => __( 'Width:', 'geodirectory' ), |
|
| 135 | - 'desc' => __( 'This is the width of the map, you can use % or px here.', 'geodirectory' ), |
|
| 134 | + 'title' => __('Width:', 'geodirectory'), |
|
| 135 | + 'desc' => __('This is the width of the map, you can use % or px here.', 'geodirectory'), |
|
| 136 | 136 | 'placeholder' => '100%', |
| 137 | 137 | 'desc_tip' => true, |
| 138 | 138 | 'default' => '100%', |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | ), |
| 142 | 142 | 'height' => array( |
| 143 | 143 | 'type' => 'text', |
| 144 | - 'title' => __( 'Height:', 'geodirectory' ), |
|
| 145 | - 'desc' => __( 'This is the height of the map, you can use %, px or vh here.', 'geodirectory' ), |
|
| 144 | + 'title' => __('Height:', 'geodirectory'), |
|
| 145 | + 'desc' => __('This is the height of the map, you can use %, px or vh here.', 'geodirectory'), |
|
| 146 | 146 | 'placeholder' => '425px', |
| 147 | 147 | 'desc_tip' => true, |
| 148 | 148 | 'default' => '425px', |
@@ -151,11 +151,11 @@ discard block |
||
| 151 | 151 | ), |
| 152 | 152 | 'maptype' => array( |
| 153 | 153 | 'type' => 'select', |
| 154 | - 'title' => __( 'Mapview:', 'geodirectory' ), |
|
| 155 | - 'desc' => __( 'This is the type of map view that will be used by default.', 'geodirectory' ), |
|
| 154 | + 'title' => __('Mapview:', 'geodirectory'), |
|
| 155 | + 'desc' => __('This is the type of map view that will be used by default.', 'geodirectory'), |
|
| 156 | 156 | 'options' => array( |
| 157 | - "roadmap" => __( 'Road Map', 'geodirectory' ), |
|
| 158 | - "satellite" => __( 'Satellite Map', 'geodirectory' ), |
|
| 157 | + "roadmap" => __('Road Map', 'geodirectory'), |
|
| 158 | + "satellite" => __('Satellite Map', 'geodirectory'), |
|
| 159 | 159 | // "hybrid" => __( 'Hybrid Map', 'geodirectory' ), |
| 160 | 160 | // "terrain" => __( 'Terrain Map', 'geodirectory' ), |
| 161 | 161 | ), |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | ), |
| 166 | 166 | 'zoom' => array( |
| 167 | 167 | 'type' => 'select', |
| 168 | - 'title' => __( 'Zoom level:', 'geodirectory' ), |
|
| 169 | - 'desc' => __( 'This is the zoom level of the map, `auto` is recommended.', 'geodirectory' ), |
|
| 170 | - 'options' => range( 1, 19 ), |
|
| 168 | + 'title' => __('Zoom level:', 'geodirectory'), |
|
| 169 | + 'desc' => __('This is the zoom level of the map, `auto` is recommended.', 'geodirectory'), |
|
| 170 | + 'options' => range(1, 19), |
|
| 171 | 171 | 'placeholder' => '', |
| 172 | 172 | 'desc_tip' => true, |
| 173 | 173 | 'default' => '7', |
@@ -175,18 +175,18 @@ discard block |
||
| 175 | 175 | ), |
| 176 | 176 | 'api_key' => array( |
| 177 | 177 | 'type' => 'text', |
| 178 | - 'title' => __( 'Api Key:', 'geodirectory' ), |
|
| 179 | - 'desc' => __( 'This is the height of the map, you can use %, px or vh here.', 'geodirectory' ), |
|
| 178 | + 'title' => __('Api Key:', 'geodirectory'), |
|
| 179 | + 'desc' => __('This is the height of the map, you can use %, px or vh here.', 'geodirectory'), |
|
| 180 | 180 | 'placeholder' => '', |
| 181 | 181 | 'desc_tip' => true, |
| 182 | 182 | 'default' => '', |
| 183 | - 'element_require' => get_option( 'rgmk_google_map_api_key', false) ? '1==0' : '1==1', |
|
| 183 | + 'element_require' => get_option('rgmk_google_map_api_key', false) ? '1==0' : '1==1', |
|
| 184 | 184 | 'advanced' => false |
| 185 | 185 | ), |
| 186 | 186 | ) |
| 187 | 187 | ); |
| 188 | 188 | |
| 189 | - parent::__construct( $options ); |
|
| 189 | + parent::__construct($options); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | * |
| 200 | 200 | * @return string |
| 201 | 201 | */ |
| 202 | - public function output( $args = array(), $widget_args = array(), $content = '' ) { |
|
| 202 | + public function output($args = array(), $widget_args = array(), $content = '') { |
|
| 203 | 203 | |
| 204 | 204 | // options |
| 205 | 205 | $defaults = array( |
@@ -217,18 +217,18 @@ discard block |
||
| 217 | 217 | /** |
| 218 | 218 | * Parse incoming $args into an array and merge it with $defaults |
| 219 | 219 | */ |
| 220 | - $args = wp_parse_args($args, $defaults ); |
|
| 220 | + $args = wp_parse_args($args, $defaults); |
|
| 221 | 221 | |
| 222 | 222 | $output = ''; |
| 223 | 223 | |
| 224 | 224 | |
| 225 | 225 | // check if we have a global API key |
| 226 | - $args['api_key'] = get_option( 'rgmk_google_map_api_key', false ) ? get_option( 'rgmk_google_map_api_key' ) : $args['api_key']; |
|
| 226 | + $args['api_key'] = get_option('rgmk_google_map_api_key', false) ? get_option('rgmk_google_map_api_key') : $args['api_key']; |
|
| 227 | 227 | |
| 228 | - if($args['type']=='image'){ |
|
| 229 | - $output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=".esc_attr($args['location'])."&maptype=".esc_attr($args['maptype'])."&zoom=".esc_attr($args['zoom'])."&size=".esc_attr($args['static_width'])."x".esc_attr($args['static_height'])."&key=".esc_attr($args['api_key'])."' />"; |
|
| 230 | - }else{ |
|
| 231 | - $output .= "<iframe width='".esc_attr($args['width'])."' height='".esc_attr($args['height'])."' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/".esc_attr($args['type'])."?q=".esc_attr($args['location'])."&maptype=".esc_attr($args['maptype'])."&zoom=".esc_attr($args['zoom'])."&key=".esc_attr($args['api_key'])."' ></iframe> "; |
|
| 228 | + if ($args['type'] == 'image') { |
|
| 229 | + $output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=" . esc_attr($args['location']) . "&maptype=" . esc_attr($args['maptype']) . "&zoom=" . esc_attr($args['zoom']) . "&size=" . esc_attr($args['static_width']) . "x" . esc_attr($args['static_height']) . "&key=" . esc_attr($args['api_key']) . "' />"; |
|
| 230 | + } else { |
|
| 231 | + $output .= "<iframe width='" . esc_attr($args['width']) . "' height='" . esc_attr($args['height']) . "' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/" . esc_attr($args['type']) . "?q=" . esc_attr($args['location']) . "&maptype=" . esc_attr($args['maptype']) . "&zoom=" . esc_attr($args['zoom']) . "&key=" . esc_attr($args['api_key']) . "' ></iframe> "; |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | return $output; |
@@ -238,6 +238,6 @@ discard block |
||
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | // register it. |
| 241 | -add_action( 'widgets_init', function () { |
|
| 242 | - register_widget( 'SD_Map' ); |
|
| 241 | +add_action('widgets_init', function() { |
|
| 242 | + register_widget('SD_Map'); |
|
| 243 | 243 | } ); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | $restrictedWords = implode('|', array_keys($this->locations)); |
| 21 | 21 | |
| 22 | 22 | $vars['name'] = strtolower($vars['name']); |
| 23 | - $vars['name'] = preg_replace('/^(?:grav-)?(?:(?:'.$restrictedWords.')-)?(.*?)(?:-(?:'.$restrictedWords.'))?$/ui', |
|
| 23 | + $vars['name'] = preg_replace('/^(?:grav-)?(?:(?:' . $restrictedWords . ')-)?(.*?)(?:-(?:' . $restrictedWords . '))?$/ui', |
|
| 24 | 24 | '$1', |
| 25 | 25 | $vars['name'] |
| 26 | 26 | ); |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | unset($vars['name'][$key]); |
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | - $vars['name'] = implode("",$vars['name']); |
|
| 25 | + $vars['name'] = implode("", $vars['name']); |
|
| 26 | 26 | |
| 27 | 27 | return $vars; |
| 28 | 28 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | private function correctPluginName($vars) |
| 30 | 30 | { |
| 31 | - $camelCasedName = preg_replace_callback('/(-[a-z])/', function ($matches) { |
|
| 31 | + $camelCasedName = preg_replace_callback('/(-[a-z])/', function($matches) { |
|
| 32 | 32 | return strtoupper($matches[0][1]); |
| 33 | 33 | }, $vars['name']); |
| 34 | 34 | $vars['name'] = ucfirst($camelCasedName); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function inflectPackageVars($vars) |
| 14 | 14 | { |
| 15 | - $vars['name'] = preg_replace_callback('/(?:^|_|-)(.?)/', function ($matches) { |
|
| 15 | + $vars['name'] = preg_replace_callback('/(?:^|_|-)(.?)/', function($matches) { |
|
| 16 | 16 | return strtoupper($matches[1]); |
| 17 | 17 | }, $vars['name']); |
| 18 | 18 | |
@@ -26,9 +26,9 @@ |
||
| 26 | 26 | class BitrixInstaller extends BaseInstaller |
| 27 | 27 | { |
| 28 | 28 | protected $locations = array( |
| 29 | - 'module' => '{$bitrix_dir}/modules/{$name}/', // deprecated, remove on the major release (Backward compatibility will be broken) |
|
| 29 | + 'module' => '{$bitrix_dir}/modules/{$name}/', // deprecated, remove on the major release (Backward compatibility will be broken) |
|
| 30 | 30 | 'component' => '{$bitrix_dir}/components/{$name}/', // deprecated, remove on the major release (Backward compatibility will be broken) |
| 31 | - 'theme' => '{$bitrix_dir}/templates/{$name}/', // deprecated, remove on the major release (Backward compatibility will be broken) |
|
| 31 | + 'theme' => '{$bitrix_dir}/templates/{$name}/', // deprecated, remove on the major release (Backward compatibility will be broken) |
|
| 32 | 32 | 'd7-module' => '{$bitrix_dir}/modules/{$vendor}.{$name}/', |
| 33 | 33 | 'd7-component' => '{$bitrix_dir}/components/{$vendor}/{$name}/', |
| 34 | 34 | 'd7-template' => '{$bitrix_dir}/templates/{$vendor}_{$name}/', |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | public function inflectPackageVars($vars) |
| 19 | 19 | { |
| 20 | - $vars['name'] = preg_replace_callback('/(-[a-z])/', function ($matches) { |
|
| 20 | + $vars['name'] = preg_replace_callback('/(-[a-z])/', function($matches) { |
|
| 21 | 21 | return strtoupper($matches[0][1]); |
| 22 | 22 | }, $vars['name']); |
| 23 | 23 | |
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | protected function inflectModuleVars($vars) |
| 37 | 37 | { |
| 38 | - $vars['name'] = str_replace('pxcms-', '', $vars['name']); // strip out pxcms- just incase (legacy) |
|
| 39 | - $vars['name'] = str_replace('module-', '', $vars['name']); // strip out module- |
|
| 40 | - $vars['name'] = preg_replace('/-module$/', '', $vars['name']); // strip out -module |
|
| 41 | - $vars['name'] = str_replace('-', '_', $vars['name']); // make -'s be _'s |
|
| 42 | - $vars['name'] = ucwords($vars['name']); // make module name camelcased |
|
| 38 | + $vars['name'] = str_replace('pxcms-', '', $vars['name']); // strip out pxcms- just incase (legacy) |
|
| 39 | + $vars['name'] = str_replace('module-', '', $vars['name']); // strip out module- |
|
| 40 | + $vars['name'] = preg_replace('/-module$/', '', $vars['name']); // strip out -module |
|
| 41 | + $vars['name'] = str_replace('-', '_', $vars['name']); // make -'s be _'s |
|
| 42 | + $vars['name'] = ucwords($vars['name']); // make module name camelcased |
|
| 43 | 43 | |
| 44 | 44 | return $vars; |
| 45 | 45 | } |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | protected function inflectThemeVars($vars) |
| 54 | 54 | { |
| 55 | - $vars['name'] = str_replace('pxcms-', '', $vars['name']); // strip out pxcms- just incase (legacy) |
|
| 56 | - $vars['name'] = str_replace('theme-', '', $vars['name']); // strip out theme- |
|
| 57 | - $vars['name'] = preg_replace('/-theme$/', '', $vars['name']); // strip out -theme |
|
| 58 | - $vars['name'] = str_replace('-', '_', $vars['name']); // make -'s be _'s |
|
| 59 | - $vars['name'] = ucwords($vars['name']); // make module name camelcased |
|
| 55 | + $vars['name'] = str_replace('pxcms-', '', $vars['name']); // strip out pxcms- just incase (legacy) |
|
| 56 | + $vars['name'] = str_replace('theme-', '', $vars['name']); // strip out theme- |
|
| 57 | + $vars['name'] = preg_replace('/-theme$/', '', $vars['name']); // strip out -theme |
|
| 58 | + $vars['name'] = str_replace('-', '_', $vars['name']); // make -'s be _'s |
|
| 59 | + $vars['name'] = ucwords($vars['name']); // make module name camelcased |
|
| 60 | 60 | |
| 61 | 61 | return $vars; |
| 62 | 62 | } |