| @@ -108,10 +108,8 @@ | ||
| 108 | 108 | // set active networks. Support doubles. |
| 109 | 109 | foreach($active_networks as $index => $network_name) |
| 110 | 110 | { |
| 111 | 111 | $network = mbSocial()->networks()->get($network_name); |
| 112 | - if (! is_object($network)) // could be removed network. | |
| 113 | - continue; | |
| 114 | 112 | if ($network->get('is_active')) |
| 115 | 113 | $selected[$index] = $network; |
| 116 | 114 | } |
| 117 | 115 | |
| @@ -126,16 +124,23 @@ | ||
| 126 | 124 | { |
| 127 | 125 | $priority = 'selected'; |
| 128 | 126 | } |
| 129 | 127 | |
| 128 | + | |
| 129 | + /* if ($priority == 'selected') | |
| 130 | + { | |
| 131 | + continue; // ignore active, since it's set earlier. | |
| 132 | + //$selected[$is_active] = $network; | |
| 133 | + | |
| 134 | + } */ | |
| 130 | 135 | if ($priority == 'unselected') |
| 131 | 136 | $unselected[] = $network; |
| 132 | 137 | if ($priority == 'readmore') |
| 133 | 138 | $readmore[] = $network; |
| 134 | 139 | |
| 140 | + | |
| 135 | 141 | if ($network->get('network') == 'maxbutton' && $priority != 'readmore') // exceptions |
| 136 | 142 | { |
| 137 | - | |
| 138 | 143 | $readmore[] = $network; |
| 139 | 144 | } |
| 140 | 145 | |
| 141 | 146 | |
| @@ -140,8 +145,9 @@ | ||
| 140 | 145 | |
| 141 | 146 | |
| 142 | 147 | } // foreach networks |
| 143 | 148 | |
| 149 | + | |
| 144 | 150 | // Sort networks by order saved. |
| 145 | 151 | ksort($selected); |
| 146 | 152 | return array('selected' => $selected, 'unselected' => $unselected, 'readmore' => $readmore); |
| 147 | 153 | } |
| @@ -191,30 +197,12 @@ | ||
| 191 | 197 | case 'nucleo': |
| 192 | 198 | $output = "<span class='mb-icon'><i class='$icon_type $icon' title='$title' > </i></span>"; |
| 193 | 199 | break; |
| 194 | 200 | case 'svg': |
| 195 | - case 'png': // via network settings, or whatever. | |
| 201 | + case 'png': | |
| 196 | 202 | $output = "<span class='mb-icon " . $icon_type . "'><img src='" . $icon . "' alt='" . $title . "'></span>"; |
| 197 | 203 | break; |
| 198 | - case 'image': // via media uploader | |
| 199 | - case 'image-remote': | |
| 200 | - if ($icon_type == 'image-remote') // when loading a custom network, before import | |
| 201 | - { | |
| 202 | - $url = $args['image_url']; | |
| 203 | - $output = '<img src="' . $url . '" border="0" />'; | |
| 204 | - } | |
| 205 | - else { | |
| 206 | - $image_id = isset($args['image_id']) ? $args['image_id'] : false; | |
| 207 | - $image_size = isset($args['image_size']) ? $args['image_size'] : false; | |
| 208 | 204 | |
| 209 | - $img_data = wp_get_attachment_image_src($image_id, $image_size); | |
| 210 | - | |
| 211 | - $width = $img_data[1]; | |
| 212 | - $height = $img_data[2]; | |
| 213 | - $url = $img_data[0]; | |
| 214 | - $output = '<span class="mb-icon ' . $icon_type . '"><img src="' . $url . '" width="' . $width . '" height="' . $height . '" border="0" /></span>'; | |
| 215 | - } | |
| 216 | - break; | |
| 217 | 205 | default: |
| 218 | 206 | $output = ''; |
| 219 | 207 | break; |
| 220 | 208 | } |
| @@ -221,38 +209,8 @@ | ||
| 221 | 209 | |
| 222 | 210 | return apply_filters('display/render/icon', $output, $args); |
| 223 | 211 | } |
| 224 | 212 | |
| 225 | - public function applyVars($string) | |
| 226 | - { | |
| 227 | - //$vars = $this->getShareData(); | |
| 228 | - $w = MBSocial()->whistle(); | |
| 229 | - | |
| 230 | - preg_match_all('/\{(.*?)\}/im', $string, $matches); | |
| 231 | - //$vars = (isset($vars[0]) && count($vars[0]) > 0) ? $vars[0] : array(); | |
| 232 | - | |
| 233 | - if (count($matches) == 0) | |
| 234 | - return $string; | |
| 235 | - | |
| 236 | - $vars = $matches[0]; // i.e. {url} | |
| 237 | - $clean_vars = $matches[1]; // i.e. url | |
| 238 | - | |
| 239 | - for($i = 0; $i < count($vars); $i++) | |
| 240 | - { | |
| 241 | - $var = $vars[$i]; | |
| 242 | - $clean_var = $clean_vars[$i]; | |
| 243 | - | |
| 244 | - if (strpos($string, $var) !== false) | |
| 245 | - { | |
| 246 | - $val = $w->ask('display/vars/' . $clean_var); | |
| 247 | - $string = str_replace($var, $val, $string); | |
| 248 | - } | |
| 249 | - | |
| 250 | - } | |
| 251 | - | |
| 252 | - return $string; | |
| 253 | - } | |
| 254 | - | |
| 255 | 213 | public function header( $args = array() ) |
| 256 | 214 | { |
| 257 | 215 | $defaults = array( |
| 258 | 216 | 'title' => '', |
| @@ -312,10 +270,9 @@ | ||
| 312 | 270 | if ($display_review) |
| 313 | 271 | { |
| 314 | 272 | add_action( 'admin_notices', array( $this, 'mbsocial_review_notice')); |
| 315 | 273 | // registered in admin scripts |
| 316 | - if (method_exists(MB(), 'load_library')) | |
| 317 | - MB()->load_library('review_notice'); | |
| 274 | + MB()->load_library('review_notice'); | |
| 318 | 275 | } |
| 319 | 276 | |
| 320 | 277 | } |
| 321 | 278 | |
