Completed
Pull Request — master (#14)
by
unknown
03:22
created
magnific_popup/drupal/magnific_popup/includes/magnific_popup.formatters.inc 1 patch
Indentation   +123 added lines, -123 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
10 10
  * Implements hook_field_formatter_info().
11 11
  */
12 12
 function magnific_popup_field_formatter_info() {
13
-  $gallery_options = _magnific_popup_gallery_options();
14
-  return array(
13
+    $gallery_options = _magnific_popup_gallery_options();
14
+    return array(
15 15
     'magnific_popup_file_field_formatter' => array(
16
-      'label' => t('Magnific Popup'),
17
-      'field types' => array('file', 'image'),
18
-      'settings'  => array(
16
+        'label' => t('Magnific Popup'),
17
+        'field types' => array('file', 'image'),
18
+        'settings'  => array(
19 19
         'gallery_style' => key($gallery_options)
20
-      )
20
+        )
21 21
     )
22
-  );
22
+    );
23 23
 }
24 24
 
25 25
 /**
@@ -32,31 +32,31 @@  discard block
 block discarded – undo
32 32
  * @return array
33 33
  */
34 34
 function magnific_popup_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
35
-  $display = $instance['display'][$view_mode];
36
-  $settings = $display['settings'];
35
+    $display = $instance['display'][$view_mode];
36
+    $settings = $display['settings'];
37 37
   
38
-  // Gallery Mode is TRUE when this field supports multiple items.
39
-  $gallery_available = 1 !== $field['cardinality'];
40
-  $gallery_options = _magnific_popup_gallery_options();
38
+    // Gallery Mode is TRUE when this field supports multiple items.
39
+    $gallery_available = 1 !== $field['cardinality'];
40
+    $gallery_options = _magnific_popup_gallery_options();
41 41
   
42
-  $element = array();
43
-  $element['gallery_available'] = array(
42
+    $element = array();
43
+    $element['gallery_available'] = array(
44 44
     '#type' => 'markup',
45 45
     '#prefix' => '<p>',
46 46
     '#suffix' => '</p>'
47
-  );
48
-  $element['gallery_available']['#markup'] = $gallery_available ?
47
+    );
48
+    $element['gallery_available']['#markup'] = $gallery_available ?
49 49
     t('This field configuration <strong>supports multiple items</strong> and can display itself as a gallery of items!') : 
50 50
     t('This field configuration <strong>does not support multiple items</strong> and cannot display itself as a gallery of items.');
51
-  $element['gallery_style'] = array(
51
+    $element['gallery_style'] = array(
52 52
     '#type' => 'select',
53 53
     '#title' => t('Gallery Type'),
54 54
     '#options' => $gallery_options,
55 55
     '#disabled' => !$gallery_available,
56 56
     '#default_value' => $settings['gallery_style'],
57 57
     '#description' => t('Choose how this gallery displays its triggering element(s).')
58
-  );
59
-  return $element;
58
+    );
59
+    return $element;
60 60
 }
61 61
 
62 62
 /**
@@ -67,11 +67,11 @@  discard block
 block discarded – undo
67 67
  * @return
68 68
  */
69 69
 function magnific_popup_field_formatter_settings_summary($field, $instance, $view_mode) {
70
-  $display = $instance['display'][$view_mode];
71
-  $settings = $display['settings'];
72
-  $gallery_options = _magnific_popup_gallery_options();
73
-  $summary = t('Gallery Type: @gallery_type', array('@gallery_type' => $gallery_options[$settings['gallery_style']]));
74
-  return $summary;
70
+    $display = $instance['display'][$view_mode];
71
+    $settings = $display['settings'];
72
+    $gallery_options = _magnific_popup_gallery_options();
73
+    $summary = t('Gallery Type: @gallery_type', array('@gallery_type' => $gallery_options[$settings['gallery_style']]));
74
+    return $summary;
75 75
 }
76 76
 
77 77
 /**
@@ -85,86 +85,86 @@  discard block
 block discarded – undo
85 85
  * @param $displays
86 86
  */
87 87
 function magnific_popup_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
88
-  // Items are some kind of entity reference, be it via image or file type.
89
-  // Load the corresponding items into a common format for our formatter_view().
90
-  $static = &drupal_static(__FUNCTION__, array('loaded_items' => array(), 'thumbnail_schemes' => NULL));
91
-  $loaded_items = &$static['loaded_items'];
92
-  $thumbnail_schemes = &$static['thumbnail_schemes'];
93
-  if (!isset($thumbnail_schemes)) {
88
+    // Items are some kind of entity reference, be it via image or file type.
89
+    // Load the corresponding items into a common format for our formatter_view().
90
+    $static = &drupal_static(__FUNCTION__, array('loaded_items' => array(), 'thumbnail_schemes' => NULL));
91
+    $loaded_items = &$static['loaded_items'];
92
+    $thumbnail_schemes = &$static['thumbnail_schemes'];
93
+    if (!isset($thumbnail_schemes)) {
94 94
     $thumbnail_schemes = module_invoke_all('magnific_popup_thumbnail_schemes');
95
-  }
96
-  // Iterate through $items looking for valid gallery items. Refactor them into
97
-  // a consistent format for magnific_popup_field_formatter_view().
98
-  $wrappers = array();
99
-  foreach ($entities as $entity_id => $entity) {
95
+    }
96
+    // Iterate through $items looking for valid gallery items. Refactor them into
97
+    // a consistent format for magnific_popup_field_formatter_view().
98
+    $wrappers = array();
99
+    foreach ($entities as $entity_id => $entity) {
100 100
     foreach ($items[$entity_id] as $delta => &$item) {
101
-      // Fail-safe check to not load items 
102
-      if (empty($item['uri'])) {
101
+        // Fail-safe check to not load items 
102
+        if (empty($item['uri'])) {
103 103
         continue;
104
-      }
105
-      // Check if we've already parsed this fid, and build it if not.
106
-      if (!isset($loaded_items[$item['fid']])) {
104
+        }
105
+        // Check if we've already parsed this fid, and build it if not.
106
+        if (!isset($loaded_items[$item['fid']])) {
107 107
         $loaded_items[$item['fid']] = FALSE;
108 108
         $scheme = file_uri_scheme($item['uri']);
109 109
         // Attempt to re-use, or load from scratch, a wrapper for this scheme.
110 110
         if (empty($wrappers[$scheme])) {
111
-          // Create a new wrapper.
112
-          $wrappers[$scheme] = file_stream_wrapper_get_instance_by_uri($item['uri']);
111
+            // Create a new wrapper.
112
+            $wrappers[$scheme] = file_stream_wrapper_get_instance_by_uri($item['uri']);
113 113
         }
114 114
         else {
115
-          // Attempt to re-use an existing wrapper.
116
-          $wrappers[$scheme]->setUri($item['uri']);
115
+            // Attempt to re-use an existing wrapper.
116
+            $wrappers[$scheme]->setUri($item['uri']);
117 117
         }
118 118
         // Check that the resource was accessible.
119 119
         if ($wrappers[$scheme] && FALSE !== $wrappers[$scheme]->url_stat($item['uri'], STREAM_URL_STAT_QUIET)) {
120
-          $wrapper = $wrappers[$scheme];
121
-          // Determine the file's info and store it.
122
-          $thumbnail_path = FALSE;
123
-          // MediaYouTubeStreamWrapper implements getLocalThumbnailPath() to
124
-          // find the thumbnail path.
125
-          if (method_exists($wrapper,'getLocalThumbnailPath')) {
120
+            $wrapper = $wrappers[$scheme];
121
+            // Determine the file's info and store it.
122
+            $thumbnail_path = FALSE;
123
+            // MediaYouTubeStreamWrapper implements getLocalThumbnailPath() to
124
+            // find the thumbnail path.
125
+            if (method_exists($wrapper,'getLocalThumbnailPath')) {
126 126
             $thumbnail_path = $wrapper->getLocalThumbnailPath();
127
-          }
128
-          // Try the standard method to get a thumbnail.
129
-          else {
127
+            }
128
+            // Try the standard method to get a thumbnail.
129
+            else {
130 130
             if ($uri = $wrapper->getUri()) {
131
-              $thumbnail_path = $uri;
131
+                $thumbnail_path = $uri;
132
+            }
132 133
             }
133
-          }
134
-          // Adjust $thumbnail_path based on the $scheme.
135
-          // @todo Make the default thumbnail_style configurable.
136
-          $thumbnail_style = 'magnific_popup_thumbnail';
137
-          if (!empty($thumbnail_schemes[$scheme])) {
134
+            // Adjust $thumbnail_path based on the $scheme.
135
+            // @todo Make the default thumbnail_style configurable.
136
+            $thumbnail_style = 'magnific_popup_thumbnail';
137
+            if (!empty($thumbnail_schemes[$scheme])) {
138 138
             $thumbnail_style = $thumbnail_schemes[$scheme];
139
-          }
140
-          $thumbnail_path = image_style_url($thumbnail_style, $thumbnail_path);
141
-          // Get the title if it exists, or fallback to the filename.
142
-          $title = !empty($item['title']) ? $item['title'] : $item['filename'];
143
-          // Get the alt if it exists, or fallback to the title.
144
-          $alt = !empty($item['alt']) ? $item['alt'] : $title;
145
-          // Build the finished gallery item.
146
-          $gallery_item = array(
139
+            }
140
+            $thumbnail_path = image_style_url($thumbnail_style, $thumbnail_path);
141
+            // Get the title if it exists, or fallback to the filename.
142
+            $title = !empty($item['title']) ? $item['title'] : $item['filename'];
143
+            // Get the alt if it exists, or fallback to the title.
144
+            $alt = !empty($item['alt']) ? $item['alt'] : $title;
145
+            // Build the finished gallery item.
146
+            $gallery_item = array(
147 147
             'item' => $item,
148 148
             'title' => $title,
149 149
             'alt' => $alt,
150 150
             'thumbnail_path' => $thumbnail_path,
151 151
             'target_uri' => $wrapper->getExternalUrl()
152
-          );
153
-          $loaded_items[$item['fid']] = $gallery_item;
152
+            );
153
+            $loaded_items[$item['fid']] = $gallery_item;
154 154
         }
155
-      }
156
-      // Replace $item with the parsed version of info for this fid.
157
-      $item = $loaded_items[$item['fid']];
158
-      // Check if this item was unloadable and if so remove it from the list.
159
-      if (empty($item)) {
155
+        }
156
+        // Replace $item with the parsed version of info for this fid.
157
+        $item = $loaded_items[$item['fid']];
158
+        // Check if this item was unloadable and if so remove it from the list.
159
+        if (empty($item)) {
160 160
         unset($items[$entity_id][$delta]);
161
-      }
161
+        }
162 162
     }
163 163
     // Remove the pointer.
164 164
     if (isset($item)) {
165
-      unset($item);
165
+        unset($item);
166
+    }
166 167
     }
167
-  }
168 168
 }
169 169
 
170 170
 /**
@@ -179,50 +179,50 @@  discard block
 block discarded – undo
179 179
  * @return array
180 180
  */
181 181
 function magnific_popup_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
182
-  if (!_magnific_popup_check_status()) {
182
+    if (!_magnific_popup_check_status()) {
183 183
     return FALSE;
184
-  }
185
-  // Add Magnific Popup library to page.
186
-  drupal_add_library('magnific_popup', 'magnific_popup_formatter', FALSE);
187
-  // Add API-derived extension JavaScript to the page; we do this here instead
188
-  // of another hook to prevent adding JS when it isn't necessary (i.e. when we
189
-  // aren't actually displaying any Magnific Popup content on the page).
190
-  _magnific_popup_add_api_js();
191
-  // Create the main container.
192
-  $element = array();
193
-  $settings = $display['settings'];
194
-  $popup_gallery = array(
184
+    }
185
+    // Add Magnific Popup library to page.
186
+    drupal_add_library('magnific_popup', 'magnific_popup_formatter', FALSE);
187
+    // Add API-derived extension JavaScript to the page; we do this here instead
188
+    // of another hook to prevent adding JS when it isn't necessary (i.e. when we
189
+    // aren't actually displaying any Magnific Popup content on the page).
190
+    _magnific_popup_add_api_js();
191
+    // Create the main container.
192
+    $element = array();
193
+    $settings = $display['settings'];
194
+    $popup_gallery = array(
195 195
     '#type' => 'container',
196 196
     '#attributes' => array(
197
-      'class' => array()
197
+        'class' => array()
198 198
     )
199
-  );
200
-  // Determine if/what the allowed trigger item is (which will get a thumbnail).
201
-  $trigger_item = key($items);
202
-  if ('random_item' === $settings['gallery_style']) {
199
+    );
200
+    // Determine if/what the allowed trigger item is (which will get a thumbnail).
201
+    $trigger_item = key($items);
202
+    if ('random_item' === $settings['gallery_style']) {
203 203
     $trigger_item = array_rand($items);
204
-  }
205
-  // Figure out the base-class for the gallery/nogallery, which is generally
206
-  // something like 'mfp-nogallery-image' or 'mfp-gallery-iframe'.
207
-  $gallery_base_class = 'no_gallery' === $settings['gallery_style'] ?
204
+    }
205
+    // Figure out the base-class for the gallery/nogallery, which is generally
206
+    // something like 'mfp-nogallery-image' or 'mfp-gallery-iframe'.
207
+    $gallery_base_class = 'no_gallery' === $settings['gallery_style'] ?
208 208
     'mfp-nogallery' : 'mfp-gallery';
209
-  if ('image' === $field['type']) {
209
+    if ('image' === $field['type']) {
210 210
     $gallery_base_class .= '-image';
211
-  }
212
-  else {
211
+    }
212
+    else {
213 213
     $gallery_base_class .= '-iframe';
214
-  }
215
-  $popup_gallery['#attributes']['class'][] = $gallery_base_class;
216
-  // Add each item to our container.
217
-  foreach ($items as $delta => $item) {
214
+    }
215
+    $popup_gallery['#attributes']['class'][] = $gallery_base_class;
216
+    // Add each item to our container.
217
+    foreach ($items as $delta => $item) {
218 218
     $popup_gallery['item-' . $delta] = array(
219
-      '#theme' => 'link',
220
-      '#text' => '',
221
-      '#path' => $item['target_uri'],
222
-      '#options' => array(
219
+        '#theme' => 'link',
220
+        '#text' => '',
221
+        '#path' => $item['target_uri'],
222
+        '#options' => array(
223 223
         'attributes' => array('class' => array(), 'style' => array()),
224 224
         'html' => TRUE
225
-      )
225
+        )
226 226
     );
227 227
     $popup_gallery['item-' . $delta]['#options']['attributes']['class'][] = 'mfp-item';
228 228
     // This item has a thumbnail image if:
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
     //  - the Gallery Type is "first item" and this $delta is the first item, or
232 232
     //  - the Gallery Type is "random item" and this $delta is the random item.
233 233
     if ('all_items' === $settings['gallery_style'] || 'no_gallery' === $settings['gallery_style'] || $delta == $trigger_item) {
234
-      $image = array(
234
+        $image = array(
235 235
         // Try to use a "figure" theme implementation if it exists, or fall back
236 236
         // to "image".
237 237
         '#theme' => array('figure', 'image'),
@@ -239,19 +239,19 @@  discard block
 block discarded – undo
239 239
         '#alt' => $item['alt'],
240 240
         '#title' => $item['title'],
241 241
         '#attributes' => array(
242
-          'class' => array('mfp-thumbnail')
242
+            'class' => array('mfp-thumbnail')
243 243
         )
244
-      );
245
-      $popup_gallery['item-' . $delta]['#text'] = render($image);
244
+        );
245
+        $popup_gallery['item-' . $delta]['#text'] = render($image);
246 246
     }
247 247
     else {
248
-      $popup_gallery['item-' . $delta]['#options']['attributes']['style'][] = 'display: none;';
248
+        $popup_gallery['item-' . $delta]['#options']['attributes']['style'][] = 'display: none;';
249
+    }
249 250
     }
250
-  }
251
-  if (count($items)) {
251
+    if (count($items)) {
252 252
     $element[0] = $popup_gallery;
253
-  }
254
-  // dpm(array(
253
+    }
254
+    // dpm(array(
255 255
     // 'function' => __function__,
256 256
     // 'entity_type' => $entity_type,
257 257
     // 'entity' => $entity,
@@ -260,18 +260,18 @@  discard block
 block discarded – undo
260 260
     // 'langcode' => $langcode,
261 261
     // 'items' => $items,
262 262
     // 'display' => $display,
263
-  // ));
264
-  return $element;
263
+    // ));
264
+    return $element;
265 265
 }
266 266
 
267 267
 /**
268 268
  * @return array
269 269
  */
270 270
 function _magnific_popup_gallery_options() {
271
-  return array(
271
+    return array(
272 272
     'all_items' => t('Gallery: All Items Displayed'),
273 273
     'first_item' => t('Gallery: First Item Displayed'),
274 274
     'random_item' => t('Gallery: Random Item Displayed'),
275 275
     'no_gallery' => t('No Gallery: Display Each Item Separately')
276
-  );
276
+    );
277 277
 }
Please login to merge, or discard this patch.
magnific_popup/drupal/magnific_popup/modules/magnific_popup_youtube.module 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -7,24 +7,24 @@
 block discarded – undo
7 7
  * Implements hook_magnific_popup_thumbnail_schemes().
8 8
  */
9 9
 function magnific_popup_youtube_magnific_popup_thumbnail_schemes() {
10
-  $thumbnail_schemes = array(
10
+    $thumbnail_schemes = array(
11 11
     'youtube' => 'magnific_popup_yt_preview_wplay'
12
-  );
13
-  return $thumbnail_schemes;
12
+    );
13
+    return $thumbnail_schemes;
14 14
 }
15 15
 
16 16
 /**
17 17
  * Implements hook_magnific_popup_iframe_patterns().
18 18
  */
19 19
 function magnific_popup_youtube_magnific_popup_iframe_patterns() {
20
-  $iframe_patterns = array(
20
+    $iframe_patterns = array(
21 21
     'youtube' => array(
22
-      'index' => 'youtube.com/',
23
-      'id' => 'v=',
24
-      'src' => '//www.youtube.com/embed/%id%?rel=0&modestbranding=1&playerapiid=mfp-iframe&controls=2&autoplay=1'
22
+        'index' => 'youtube.com/',
23
+        'id' => 'v=',
24
+        'src' => '//www.youtube.com/embed/%id%?rel=0&modestbranding=1&playerapiid=mfp-iframe&controls=2&autoplay=1'
25 25
     )
26
-  );
27
-  return $iframe_patterns;
26
+    );
27
+    return $iframe_patterns;
28 28
 }
29 29
 
30 30
 require_once('includes/magnific_popup_youtube.image_styles.inc');
Please login to merge, or discard this patch.
magnific_popup/modules/includes/magnific_popup_youtube.image_styles.inc 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -9,14 +9,14 @@  discard block
 block discarded – undo
9 9
  * Implements hook_image_default_styles().
10 10
  */
11 11
 function magnific_popup_youtube_image_default_styles() {
12
-  $styles = array();
13
-  $module_path = drupal_get_path('module', 'magnific_popup_youtube');
14
-  // Exported image style: youtube_play_preview.
15
-  $styles['magnific_popup_yt_preview_wplay'] = array(
12
+    $styles = array();
13
+    $module_path = drupal_get_path('module', 'magnific_popup_youtube');
14
+    // Exported image style: youtube_play_preview.
15
+    $styles['magnific_popup_yt_preview_wplay'] = array(
16 16
     'name' => 'magnific_popup_yt_preview_wplay',
17 17
     'label' => t('Magnific Popup: YouTube Preview w/Play button overlay'),
18 18
     'effects' => array(
19
-      4 => array(
19
+        4 => array(
20 20
         'label' => 'Scale and crop',
21 21
         'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.',
22 22
         'effect callback' => 'image_scale_and_crop_effect',
@@ -26,12 +26,12 @@  discard block
 block discarded – undo
26 26
         'module' => 'image',
27 27
         'name' => 'image_scale_and_crop',
28 28
         'data' => array(
29
-          'width' => 480,
30
-          'height' => 270
29
+            'width' => 480,
30
+            'height' => 270
31 31
         ),
32 32
         'weight' => -10
33
-      ),
34
-      2 => array(
33
+        ),
34
+        2 => array(
35 35
         'label' => 'Overlay (watermark)',
36 36
         'help' => 'Choose the file image you wish to use as an overlay, and position it in a layer on top of the canvas.',
37 37
         'effect callback' => 'canvasactions_file2canvas_effect',
@@ -41,14 +41,14 @@  discard block
 block discarded – undo
41 41
         'module' => 'imagecache_canvasactions',
42 42
         'name' => 'canvasactions_file2canvas',
43 43
         'data' => array(
44
-          'xpos' => 'center',
45
-          'ypos' => 'bottom',
46
-          'alpha' => 100,
47
-          'path' => "{$module_path}/assets/images/youtube-chrome_bottom.png"
44
+            'xpos' => 'center',
45
+            'ypos' => 'bottom',
46
+            'alpha' => 100,
47
+            'path' => "{$module_path}/assets/images/youtube-chrome_bottom.png"
48 48
         ),
49 49
         'weight' => -9
50
-      ),
51
-      3 => array(
50
+        ),
51
+        3 => array(
52 52
         'label' => 'Overlay (watermark)',
53 53
         'help' => 'Choose the file image you wish to use as an overlay, and position it in a layer on top of the canvas.',
54 54
         'effect callback' => 'canvasactions_file2canvas_effect',
@@ -58,15 +58,15 @@  discard block
 block discarded – undo
58 58
         'module' => 'imagecache_canvasactions',
59 59
         'name' => 'canvasactions_file2canvas',
60 60
         'data' => array(
61
-          'xpos' => 'center',
62
-          'ypos' => 'center',
63
-          'alpha' => 100,
64
-          'path' => "{$module_path}/images/youtube-play_button.png"
61
+            'xpos' => 'center',
62
+            'ypos' => 'center',
63
+            'alpha' => 100,
64
+            'path' => "{$module_path}/images/youtube-play_button.png"
65 65
         ),
66 66
         'weight' => -8
67
-      )
67
+        )
68 68
     )
69
-  );
69
+    );
70 70
 
71
-  return $styles;
71
+    return $styles;
72 72
 }
Please login to merge, or discard this patch.
assets/js/magnific_popup/drupal/magnific_popup/magnific_popup.module 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -7,48 +7,48 @@  discard block
 block discarded – undo
7 7
  * Implements hook_library().
8 8
  */
9 9
 function magnific_popup_library() {
10
-  $libraries = array();
10
+    $libraries = array();
11 11
 
12
-  $magnific_library_path = libraries_get_path('magnific-popup', FALSE);
13
-  $module_path = drupal_get_path('module', 'magnific_popup');
12
+    $magnific_library_path = libraries_get_path('magnific-popup', FALSE);
13
+    $module_path = drupal_get_path('module', 'magnific_popup');
14 14
   
15
-  if (empty($magnific_library_path)) {
15
+    if (empty($magnific_library_path)) {
16 16
     drupal_set_message(t('Please install the Magnific Popup JS library in sites/.../libraries/magnific-popup/.'), 'error');
17 17
     return array();
18
-  }
18
+    }
19 19
   
20
-  $libraries['magnific_popup'] = array(
20
+    $libraries['magnific_popup'] = array(
21 21
     'title' => 'Magnific Popup jQuery Plugin',
22 22
     'website' => 'http://dimsemenov.com/plugins/magnific-popup/',
23 23
     'version' => '1',
24 24
     'js' => array(
25
-      "{$magnific_library_path}/dist/jquery.magnific-popup.js" => array('type' => 'file')
25
+        "{$magnific_library_path}/dist/jquery.magnific-popup.js" => array('type' => 'file')
26 26
     ),
27 27
     'css' => array(
28
-      "{$magnific_library_path}/dist/magnific-popup.css" => array('type' => 'file')
28
+        "{$magnific_library_path}/dist/magnific-popup.css" => array('type' => 'file')
29 29
     ),
30 30
     'dependencies' => array(
31
-      array('system', 'jquery')
31
+        array('system', 'jquery')
32 32
     )
33
-  );
33
+    );
34 34
   
35
-  $libraries['magnific_popup_formatter'] = array(
35
+    $libraries['magnific_popup_formatter'] = array(
36 36
     'title' => 'Magnific Popup Module Extension',
37 37
     'website' => '',
38 38
     'version' => '1',
39 39
     'js' => array(
40
-      "{$module_path}/js/behaviors.mfp-formatter.js" => array('type' => 'file')
40
+        "{$module_path}/js/behaviors.mfp-formatter.js" => array('type' => 'file')
41 41
     ),
42 42
     'css' => array(
43
-      "{$module_path}/css/mfp-formatter.css" => array('type' => 'file')
43
+        "{$module_path}/css/mfp-formatter.css" => array('type' => 'file')
44 44
     ),
45 45
     'dependencies' => array(
46
-      array('system', 'jquery'),
47
-      array('magnific_popup', 'magnific_popup')
46
+        array('system', 'jquery'),
47
+        array('magnific_popup', 'magnific_popup')
48 48
     )
49
-  );
49
+    );
50 50
   
51
-  return $libraries;
51
+    return $libraries;
52 52
 }
53 53
 
54 54
 /**
@@ -58,55 +58,55 @@  discard block
 block discarded – undo
58 58
  * @return array
59 59
  */
60 60
 function magnific_popup_ctools_plugin_api($owner, $api) {
61
-  static $api_versions = array(
61
+    static $api_versions = array(
62 62
     'file_entity' => array(
63
-      'file_default_displays' => 1
63
+        'file_default_displays' => 1
64 64
     )
65
-  );
66
-  if (isset($api_versions[$owner][$api])) {
65
+    );
66
+    if (isset($api_versions[$owner][$api])) {
67 67
     return array('version' => $api_versions[$owner][$api]);
68
-  }
68
+    }
69 69
 }
70 70
 
71 71
 /**
72 72
  * Internal utility function to check required library status.
73 73
  */
74 74
 function _magnific_popup_check_status() {
75
-  $jquery = drupal_get_library('system', 'jquery');
76
-  if (empty($jquery) || empty($jquery['version'])) {
75
+    $jquery = drupal_get_library('system', 'jquery');
76
+    if (empty($jquery) || empty($jquery['version'])) {
77 77
     // jQuery not available?  Totally an error condition.
78 78
     // @todo We should watchdog this, and/or report it on site status screen.
79 79
     return FALSE;
80
-  }
81
-  // Check if the available jQuery version is 1.7.2+.
82
-  // @see http://dimsemenov.com/plugins/magnific-popup/documentation.html
83
-  if (version_compare($jquery['version'], '1.7.2') < 0) {
80
+    }
81
+    // Check if the available jQuery version is 1.7.2+.
82
+    // @see http://dimsemenov.com/plugins/magnific-popup/documentation.html
83
+    if (version_compare($jquery['version'], '1.7.2') < 0) {
84 84
     // $jquery['version'] is lower than 1.7.2.
85 85
     // @todo We should watchdog this, and/or report it on site status screen.
86 86
     return FALSE;
87
-  }
88
-  return TRUE;
87
+    }
88
+    return TRUE;
89 89
 }
90 90
 
91 91
 /**
92 92
  * Internal utility function to add one-time JS settings from extension modules.
93 93
  */
94 94
 function _magnific_popup_add_api_js() {
95
-  $added = &drupal_static(__FUNCTION__, FALSE);
96
-  // Don't add JS more than once.
97
-  if ($added) {
95
+    $added = &drupal_static(__FUNCTION__, FALSE);
96
+    // Don't add JS more than once.
97
+    if ($added) {
98 98
     return;
99
-  }
100
-  $settings = array(
99
+    }
100
+    $settings = array(
101 101
     'magnific_popup_api' => array(
102
-      'iframe_patterns' => module_invoke_all('magnific_popup_iframe_patterns')
102
+        'iframe_patterns' => module_invoke_all('magnific_popup_iframe_patterns')
103 103
     )
104
-  );
105
-  $options = array(
104
+    );
105
+    $options = array(
106 106
     'type' => 'setting'
107
-  );
107
+    );
108 108
   
109
-  drupal_add_js($settings, $options);
109
+    drupal_add_js($settings, $options);
110 110
 }
111 111
 
112 112
 require_once('includes/magnific_popup.image_styles.inc');
Please login to merge, or discard this patch.
assets/js/magnific_popup/redaxo/magnific_popup/install.inc.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -15,23 +15,23 @@  discard block
 block discarded – undo
15 15
 
16 16
     // effects
17 17
     $sql->setQuery('INSERT INTO `'
18
-                   . $REX['TABLE_PREFIX']
19
-                   . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
20
-                   . $lastId
21
-                   . ", 'resize','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:3:\"500\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',1,"
22
-                   . time()
23
-                   . ",'admin',"
24
-                   . time()
25
-                   . ",'admin')");
18
+                    . $REX['TABLE_PREFIX']
19
+                    . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
20
+                    . $lastId
21
+                    . ", 'resize','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:3:\"500\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',1,"
22
+                    . time()
23
+                    . ",'admin',"
24
+                    . time()
25
+                    . ",'admin')");
26 26
     $sql->setQuery('INSERT INTO `'
27
-                   . $REX['TABLE_PREFIX']
28
-                   . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
29
-                   . $lastId
30
-                   . ", 'filter_sharpen','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:0:\"\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',2,"
31
-                   . time()
32
-                   . ",'admin',"
33
-                   . time()
34
-                   . ",'admin')");
27
+                    . $REX['TABLE_PREFIX']
28
+                    . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
29
+                    . $lastId
30
+                    . ", 'filter_sharpen','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:0:\"\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',2,"
31
+                    . time()
32
+                    . ",'admin',"
33
+                    . time()
34
+                    . ",'admin')");
35 35
 }
36 36
 
37 37
 // add gallery image imagetype
@@ -45,32 +45,32 @@  discard block
 block discarded – undo
45 45
 
46 46
     // effects
47 47
     $sql->setQuery('INSERT INTO `'
48
-                   . $REX['TABLE_PREFIX']
49
-                   . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
50
-                   . $lastId
51
-                   . ", 'resize','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:3:\"200\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',1,"
52
-                   . time()
53
-                   . ",'admin',"
54
-                   . time()
55
-                   . ",'admin')");
48
+                    . $REX['TABLE_PREFIX']
49
+                    . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
50
+                    . $lastId
51
+                    . ", 'resize','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:3:\"200\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',1,"
52
+                    . time()
53
+                    . ",'admin',"
54
+                    . time()
55
+                    . ",'admin')");
56 56
     $sql->setQuery('INSERT INTO `'
57
-                   . $REX['TABLE_PREFIX']
58
-                   . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
59
-                   . $lastId
60
-                   . ", 'crop','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:3:\"200\";s:22:\"rex_effect_crop_height\";s:3:\"133\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:0:\"\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',2,"
61
-                   . time()
62
-                   . ",'admin',"
63
-                   . time()
64
-                   . ",'admin')");
57
+                    . $REX['TABLE_PREFIX']
58
+                    . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
59
+                    . $lastId
60
+                    . ", 'crop','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:3:\"200\";s:22:\"rex_effect_crop_height\";s:3:\"133\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:0:\"\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',2,"
61
+                    . time()
62
+                    . ",'admin',"
63
+                    . time()
64
+                    . ",'admin')");
65 65
     $sql->setQuery('INSERT INTO `'
66
-                   . $REX['TABLE_PREFIX']
67
-                   . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
68
-                   . $lastId
69
-                   . ", 'filter_sharpen','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:0:\"\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',3,"
70
-                   . time()
71
-                   . ",'admin',"
72
-                   . time()
73
-                   . ",'admin')");
66
+                    . $REX['TABLE_PREFIX']
67
+                    . '679_type_effects` (type_id, effect, parameters, prior, updatedate, updateuser, createdate, createuser) VALUES ('
68
+                    . $lastId
69
+                    . ", 'filter_sharpen','a:8:{s:15:\"rex_effect_crop\";a:6:{s:21:\"rex_effect_crop_width\";s:0:\"\";s:22:\"rex_effect_crop_height\";s:0:\"\";s:28:\"rex_effect_crop_offset_width\";s:0:\"\";s:29:\"rex_effect_crop_offset_height\";s:0:\"\";s:20:\"rex_effect_crop_hpos\";s:6:\"center\";s:20:\"rex_effect_crop_vpos\";s:6:\"middle\";}s:22:\"rex_effect_filter_blur\";a:3:{s:29:\"rex_effect_filter_blur_amount\";s:2:\"80\";s:29:\"rex_effect_filter_blur_radius\";s:1:\"8\";s:32:\"rex_effect_filter_blur_threshold\";s:1:\"3\";}s:25:\"rex_effect_filter_sharpen\";a:3:{s:32:\"rex_effect_filter_sharpen_amount\";s:2:\"80\";s:32:\"rex_effect_filter_sharpen_radius\";s:3:\"0.5\";s:35:\"rex_effect_filter_sharpen_threshold\";s:1:\"3\";}s:15:\"rex_effect_flip\";a:1:{s:20:\"rex_effect_flip_flip\";s:1:\"X\";}s:23:\"rex_effect_insert_image\";a:5:{s:34:\"rex_effect_insert_image_brandimage\";s:0:\"\";s:28:\"rex_effect_insert_image_hpos\";s:4:\"left\";s:28:\"rex_effect_insert_image_vpos\";s:3:\"top\";s:33:\"rex_effect_insert_image_padding_x\";s:3:\"-10\";s:33:\"rex_effect_insert_image_padding_y\";s:3:\"-10\";}s:17:\"rex_effect_mirror\";a:5:{s:24:\"rex_effect_mirror_height\";s:0:\"\";s:33:\"rex_effect_mirror_set_transparent\";s:7:\"colored\";s:22:\"rex_effect_mirror_bg_r\";s:0:\"\";s:22:\"rex_effect_mirror_bg_g\";s:0:\"\";s:22:\"rex_effect_mirror_bg_b\";s:0:\"\";}s:17:\"rex_effect_resize\";a:4:{s:23:\"rex_effect_resize_width\";s:0:\"\";s:24:\"rex_effect_resize_height\";s:0:\"\";s:23:\"rex_effect_resize_style\";s:7:\"maximum\";s:31:\"rex_effect_resize_allow_enlarge\";s:7:\"enlarge\";}s:20:\"rex_effect_workspace\";a:8:{s:26:\"rex_effect_workspace_width\";s:0:\"\";s:27:\"rex_effect_workspace_height\";s:0:\"\";s:25:\"rex_effect_workspace_hpos\";s:4:\"left\";s:25:\"rex_effect_workspace_vpos\";s:3:\"top\";s:36:\"rex_effect_workspace_set_transparent\";s:7:\"colored\";s:25:\"rex_effect_workspace_bg_r\";s:0:\"\";s:25:\"rex_effect_workspace_bg_g\";s:0:\"\";s:25:\"rex_effect_workspace_bg_b\";s:0:\"\";}}',3,"
70
+                    . time()
71
+                    . ",'admin',"
72
+                    . time()
73
+                    . ",'admin')");
74 74
 }
75 75
 
76 76
 if ('' == $error) {
Please login to merge, or discard this patch.
language/english/modinfo.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 define('_MI_EXTGAL_NAME_PATTERN', 'Auto photo description pattern');
51 51
 define(
52 52
     '_MI_EXTGAL_NAME_PATTERN_DESC',
53
-       "If you don't provide a description for your photo on upload the file name of the photo will be used to make an auto description.<br> For example, with a \"Tournament-06-may-2006_1.jpg\" photo name, you will end up with \"Tournament 06 may 2006\" as the description"
53
+        "If you don't provide a description for your photo on upload the file name of the photo will be used to make an auto description.<br> For example, with a \"Tournament-06-may-2006_1.jpg\" photo name, you will end up with \"Tournament 06 may 2006\" as the description"
54 54
 );
55 55
 define('_MI_EXTGAL_DISPLAY_EXTRA', 'Display an extra field');
56 56
 define('_MI_EXTGAL_DISPLAY_EXTRA_DESC', 'Choose whether on not to add more information on submit form. For example, you could use this feature to add a PayPal button to each photo.');
Please login to merge, or discard this patch.
language/english/admin.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 define('_AM_EXTGALLERY_PUBLIC_AUTOAPROVE_DESC', "Select categories where public photo uploads don't need admin approval");
136 136
 define(
137 137
     '_AM_EXTGALLERY_PUBLIC_AUTOAPROVE_INFO',
138
-       "Allows you to prevent the automatic display of submitted public images until they are approved by an Admin. Select category where public user uploads don't need to be approved. Public users must be allowed to submit photos to enable this permission."
138
+        "Allows you to prevent the automatic display of submitted public images until they are approved by an Admin. Select category where public user uploads don't need to be approved. Public users must be allowed to submit photos to enable this permission."
139 139
 );
140 140
 
141 141
 define('_AM_EXTGALLERY_PUBLIC_DISPLAYED', 'Display album permissions');
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 define('_AM_EXTGALLERY_USE_AJAX_EFFECTS', 'Ajax effects ');
250 250
 define(
251 251
     '_AM_EXTGALLERY_USE_AJAX_EFFECTS_DESC',
252
-       'Selecting effects will change photo display when thumbs are clicked. Ajax effects or Normal can be selected.<br><br> <b>Normal</b> :  No effects<br><b>Lightbox</b> : Use Lightbox effect<br><b>Overlay</b> : use Overlay effect<br><b>Tooltip</b> : use Tooltip effect<br><b>Fancybox</b> : use Fancybox effect<br><b>PrettyPhoto</b> : use PrettyPhoto effect<br>'
252
+        'Selecting effects will change photo display when thumbs are clicked. Ajax effects or Normal can be selected.<br><br> <b>Normal</b> :  No effects<br><b>Lightbox</b> : Use Lightbox effect<br><b>Overlay</b> : use Overlay effect<br><b>Tooltip</b> : use Tooltip effect<br><b>Fancybox</b> : use Fancybox effect<br><b>PrettyPhoto</b> : use PrettyPhoto effect<br>'
253 253
 );
254 254
 define('_AM_EXTGALLERY_ALBUM_CONF', 'Album configuration');
255 255
 define('_AM_EXTGALLERY_OVERLAY_CONF', 'Overlay configuration');
Please login to merge, or discard this patch.
admin/perm-quota.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -139,20 +139,20 @@  discard block
 block discarded – undo
139 139
             }
140 140
 
141 141
             echo '<fieldset id="'
142
-                 . $perm['name']
143
-                 . 'Bookmark"><legend><a href="#'
144
-                 . $perm['name']
145
-                 . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
146
-                 . $perm['name']
147
-                 . '\'); toggleIcon(\''
148
-                 . $perm['name']
149
-                 . 'Icon\');"><img id="'
150
-                 . $perm['name']
151
-                 . 'Icon" src="../assets/images/minus.gif">&nbsp;'
152
-                 . constant($perm['title'])
153
-                 . '</a></legend><div id="'
154
-                 . $perm['name']
155
-                 . '">';
142
+                    . $perm['name']
143
+                    . 'Bookmark"><legend><a href="#'
144
+                    . $perm['name']
145
+                    . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
146
+                    . $perm['name']
147
+                    . '\'); toggleIcon(\''
148
+                    . $perm['name']
149
+                    . 'Icon\');"><img id="'
150
+                    . $perm['name']
151
+                    . 'Icon" src="../assets/images/minus.gif">&nbsp;'
152
+                    . constant($perm['title'])
153
+                    . '</a></legend><div id="'
154
+                    . $perm['name']
155
+                    . '">';
156 156
             echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTGALLERY_INFORMATION . '</legend>';
157 157
             echo constant($perm['info']);
158 158
             echo '</fieldset>';
@@ -173,20 +173,20 @@  discard block
 block discarded – undo
173 173
             }
174 174
 
175 175
             echo '<fieldset id="'
176
-                 . $perm['name']
177
-                 . 'Bookmark"><legend><a href="#'
178
-                 . $perm['name']
179
-                 . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
180
-                 . $perm['name']
181
-                 . '\'); toggleIcon(\''
182
-                 . $perm['name']
183
-                 . 'Icon\');"><img id="'
184
-                 . $perm['name']
185
-                 . 'Icon" src="../assets/images/minus.gif">&nbsp;'
186
-                 . constant($perm['title'])
187
-                 . '</a></legend><div id="'
188
-                 . $perm['name']
189
-                 . '">';
176
+                    . $perm['name']
177
+                    . 'Bookmark"><legend><a href="#'
178
+                    . $perm['name']
179
+                    . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
180
+                    . $perm['name']
181
+                    . '\'); toggleIcon(\''
182
+                    . $perm['name']
183
+                    . 'Icon\');"><img id="'
184
+                    . $perm['name']
185
+                    . 'Icon" src="../assets/images/minus.gif">&nbsp;'
186
+                    . constant($perm['title'])
187
+                    . '</a></legend><div id="'
188
+                    . $perm['name']
189
+                    . '">';
190 190
             echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTGALLERY_INFORMATION . '</legend>';
191 191
             echo constant($perm['info']);
192 192
             echo '</fieldset>';
@@ -200,8 +200,8 @@  discard block
 block discarded – undo
200 200
          * Public category permission mask
201 201
          */
202 202
         echo '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../assets/images/minus.gif">&nbsp;'
203
-             . _AM_EXTGALLERY_PUBLIC_PERM_MASK
204
-             . '</a></legend><div id="default">';
203
+                . _AM_EXTGALLERY_PUBLIC_PERM_MASK
204
+                . '</a></legend><div id="default">';
205 205
         echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTGALLERY_INFORMATION . '</legend>';
206 206
         echo _AM_EXTGALLERY_PUBLIC_PERM_MASK_INFO;
207 207
         echo '</fieldset><br>';
Please login to merge, or discard this patch.
admin/photo.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -151,10 +151,10 @@
 block discarded – undo
151 151
             echo '</div>';
152 152
 
153 153
             xoops_confirm([
154
-                              'cat_id'     => $_POST['cat_id'],
155
-                              'photo_desc' => $_POST['photo_desc'],
156
-                              'nbPhoto'    => $nbPhotos
157
-                          ], 'photo.php?op=batchAdd', _AM_EXTGALLERY_DELETE_CAT_CONFIRM);
154
+                                'cat_id'     => $_POST['cat_id'],
155
+                                'photo_desc' => $_POST['photo_desc'],
156
+                                'nbPhoto'    => $nbPhotos
157
+                            ], 'photo.php?op=batchAdd', _AM_EXTGALLERY_DELETE_CAT_CONFIRM);
158 158
 
159 159
             xoops_cp_footer();
160 160
         } else {
Please login to merge, or discard this patch.