WP Photo Album Plus - Version 8.0.04.005

Version Description

= 8.0.03 =

  • This version addresses various minor bug fixes and feature requests.
Download this release

Release Info

Developer opajaap
Plugin Icon wp plugin WP Photo Album Plus
Version 8.0.04.005
Comparing to
See all releases

Code changes from version 8.0.04.004 to 8.0.04.005

changelog.txt CHANGED
@@ -12,6 +12,7 @@ WP Photo Album Plus Changelog
12
  * Albums now have a status. Publish is the default, Private: only visible to loggedin visitors, Hidden: only visible to admin and superusers.
13
  * Mailing unsubscribe links failed. Fixed.
14
  * Improved algorithm to clear non-wppa caches.
 
15
 
16
  = 8.0.03 =
17
 
12
  * Albums now have a status. Publish is the default, Private: only visible to loggedin visitors, Hidden: only visible to admin and superusers.
13
  * Mailing unsubscribe links failed. Fixed.
14
  * Improved algorithm to clear non-wppa caches.
15
+ * Corrected and extended helptext in titles (balloons) on the Album Admin -> Edit Album Information page.
16
 
17
  = 8.0.03 =
18
 
theme/wppa-theme.php CHANGED
@@ -3,11 +3,11 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the albums/photos/slideshow in a page or post
6
- * Version 8.0.04.004
7
  */
8
  function wppa_theme() {
9
 
10
- global $wppa_version; $wppa_version = '8.0.04.004'; // The version number of this file
11
  global $wppa;
12
  global $wppa_show_statistics; // Can be set to true by a custom page template
13
  global $wppa_empty_content;
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the albums/photos/slideshow in a page or post
6
+ * Version 8.0.04.005
7
  */
8
  function wppa_theme() {
9
 
10
+ global $wppa_version; $wppa_version = '8.0.04.005'; // The version number of this file
11
  global $wppa;
12
  global $wppa_show_statistics; // Can be set to true by a custom page template
13
  global $wppa_empty_content;
wppa-admin.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains the admin menu and startups the admin pages
6
- * Version 8.0.02.006
7
  *
8
  */
9
 
@@ -285,7 +285,12 @@ function wppa_clear_wppa_cache() {
285
  class="button-primary"
286
  onclick="document.location.href=\'' . admin_url( 'admin.php?page=wppa_clear_cache&delete' ) . '\'"
287
  value="' . __( 'Delete', 'wp-photo-album-plus' ) . '"
288
- />';
 
 
 
 
 
289
  }
290
  echo '
291
  </div>';
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains the admin menu and startups the admin pages
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
285
  class="button-primary"
286
  onclick="document.location.href=\'' . admin_url( 'admin.php?page=wppa_clear_cache&delete' ) . '\'"
287
  value="' . __( 'Delete', 'wp-photo-album-plus' ) . '"
288
+ /><br />
289
+
290
+ <p>' .
291
+ __( 'Hits', 'wp-photo-album-plus' ) . ': ' . get_option( 'wppa_cache_hits', '0' ) . ', ' .
292
+ __( 'Misses', 'wp-photo-album-plus' ) .': ' . get_option( 'wppa_cache_misses', '0' ) .
293
+ '</p>';
294
  }
295
  echo '
296
  </div>';
wppa-admins-choice-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the admins-choice widget
6
- * Version 8.0.00.024
7
  *
8
  */
9
 
@@ -48,6 +48,7 @@ class AdminsChoice extends WP_Widget {
48
  // No, use it
49
  else {
50
  echo wppa_get_contents( $cachefile );
 
51
  echo wppa_widget_timer( 'show', $widget_title, true );
52
  wppa( 'in_widget', false );
53
  return;
@@ -83,6 +84,7 @@ class AdminsChoice extends WP_Widget {
83
  // Cache?
84
  if ( $cache ) {
85
  wppa_put_contents( $cachefile, $result );
 
86
  }
87
 
88
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the admins-choice widget
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
48
  // No, use it
49
  else {
50
  echo wppa_get_contents( $cachefile );
51
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
52
  echo wppa_widget_timer( 'show', $widget_title, true );
53
  wppa( 'in_widget', false );
54
  return;
84
  // Cache?
85
  if ( $cache ) {
86
  wppa_put_contents( $cachefile, $result );
87
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
88
  }
89
 
90
  wppa( 'in_widget', false );
wppa-album-admin-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
- * Version 8.0.04.004
7
  *
8
  */
9
 
@@ -602,9 +602,21 @@ global $wppa_revno;
602
  />&nbsp;';
603
  }
604
  else {
 
 
 
 
 
 
 
 
 
 
 
605
  echo '
606
  <select
607
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'owner\', this )"
 
608
  >';
609
  wppa_user_select( $owner );
610
  echo '
@@ -614,7 +626,7 @@ global $wppa_revno;
614
 
615
  // Order # -->
616
  echo
617
- __( 'Album order #', 'wp-photo-album-plus' ) . ':&nbsp;
618
  <input
619
  type="text"
620
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'a_order\', this )"
@@ -624,14 +636,18 @@ global $wppa_revno;
624
  if ( wppa_opt( 'list_albums_by' ) != '1' && $a_order != '0' ) {
625
  echo
626
  '<small class="description" style="color:red" >' .
627
- __( 'Album order # has only effect if you set the album sort order method to <b>Order #</b> in the Photo Albums -> Settings screen.<br />', 'wp-photo-album-plus' ) .
628
  '</small>' . ' ';
629
  }
630
 
631
  // Status
 
 
632
  echo
633
  __( 'Status', 'wp-photo-album-plus' ) . ':&nbsp;
634
- <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'status\', this )" >
 
 
635
  <option value="publish"' . ( $status == 'publish' ? ' selected' : '' ) . ' >' .
636
  __( 'Publish', 'wp-photo-album-plus' ) . '
637
  </option>
@@ -659,7 +675,7 @@ global $wppa_revno;
659
  'sort' => true,
660
  'tagopen' => '<select' .
661
  ' id="wppa-parsel"' .
662
- ' style="max-width:300px;"' .
663
  ' onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'a_parent\', this )"' .
664
  ' >',
665
  'tagid' => 'wppa-parsel',
@@ -694,7 +710,7 @@ global $wppa_revno;
694
  if ( ! wppa_switch( 'porder_restricted' ) || wppa_user_is( 'administrator' ) ) {
695
  echo
696
  __( 'Photo order:', 'wp-photo-album-plus' ) . ' ';
697
- $options = array( __( '--- default --- See Table IV-C1', 'wp-photo-album-plus' ),
698
  __( 'Order #', 'wp-photo-album-plus' ),
699
  __( 'Name', 'wp-photo-album-plus' ),
700
  __( 'Random', 'wp-photo-album-plus' ),
@@ -724,9 +740,21 @@ global $wppa_revno;
724
  '-5',
725
  '-7'
726
  );
 
 
 
 
 
 
 
 
 
 
 
727
  echo '
728
  <select
729
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'p_order_by\', this )"
 
730
  >';
731
  foreach ( array_keys( $options ) as $key ) {
732
  $sel = $values[$key] == $p_order_by ? ' selected="selected"' : '';
@@ -738,26 +766,48 @@ global $wppa_revno;
738
 
739
  // Child album order
740
  $sel = ' selected="selected"';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
741
  echo
742
  __( 'Sub album sort order', 'wp-photo-album-plus' ) . ':&nbsp;
743
  <select
744
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'suba_order_by\', this )"
745
- >
746
- <option value="0"' . ( $suba_order_by == '0' ? $sel : '' ) . ' >' . __( '--- default --- See Table IV-D1', 'wp-photo-album-plus' ) . '</option>
747
- <option value="3"' . ( $suba_order_by == '3' ? $sel : '' ) . ' >' . __( 'Random', 'wp-photo-album-plus' ) . '</option>
748
- <option value="1"' . ( $suba_order_by == '1' ? $sel : '' ) . ' >' . __( 'Order #', 'wp-photo-album-plus' ) . '</option>
749
- <option value="-1"' . ( $suba_order_by == '-1' ? $sel : '' ) . ' >' . __( 'Order # reverse', 'wp-photo-album-plus' ) . '</option>
750
- <option value="2"' . ( $suba_order_by == '2' ? $sel : '' ) . ' >' . __( 'Name', 'wp-photo-album-plus' ) . '</option>
751
- <option value="-2"' . ( $suba_order_by == '-2' ? $sel : '' ) . ' >' . __( 'Name reverse', 'wp-photo-album-plus' ) . '</option>
752
- <option value="5"' . ( $suba_order_by == '5' ? $sel : '' ) . ' >' . __( 'Timestamp', 'wp-photo-album-plus' ) . '</option>
753
- <option value="-5"' . ( $suba_order_by == '-5' ? $sel : '' ) . ' >' . __( 'Timestamp reverse', 'wp-photo-album-plus' ) . '</option>
754
  </select>&nbsp;';
755
 
756
  // Alternative thumbnail size
757
  if ( ! wppa_switch( 'alt_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
 
758
  $sel = ' selected="selected"';
759
  echo __( 'Use alt thumbsize', 'wp-photo-album-plus' ) . ':&nbsp;
760
- <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'alt_thumbsize\', this )" >
 
 
 
761
  <option value="0"' . ( $alt_thumbsize ? '' : $sel ) . ' >' .
762
  __( 'no', 'wp-photo-album-plus' ) . '
763
  </option>
@@ -770,11 +820,15 @@ global $wppa_revno;
770
  // Cover type
771
  if ( ! wppa_switch( 'covertype_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
772
  $sel = ' selected="selected"';
 
773
  echo
774
- __( 'Cover Type', 'wp-photo-album-plus' ) . ':&nbsp;
775
- <select onchange="wppaAjaxUpdateAlbum( '. $id . ', \'cover_type\', this )" >
 
 
 
776
  <option value=""' . ( $cover_type == '' ? $sel : '' ) . ' >' .
777
- __( '--- default --- See Table IV-D6', 'wp-photo-album-plus' ) . '
778
  </option>
779
  <option value="default"' . ( $cover_type == 'default' ? $sel : '' ) . ' >' .
780
  __( 'Standard', 'wp-photo-album-plus' ) . '
@@ -799,7 +853,7 @@ global $wppa_revno;
799
 
800
  // Cover photo
801
  echo
802
- __( 'Cover Photo:', 'wp-photo-album-plus' ) . '&nbsp;' .
803
  wppa_main_photo( $main_photo, $cover_type ) . '&nbsp;';
804
 
805
  // Upload limit
@@ -811,13 +865,14 @@ global $wppa_revno;
811
  }
812
  if ( wppa_user_is( 'administrator' ) ) {
813
  $sel = ' selected="selected"';
 
814
  echo '
815
  <input
816
  type="text"
817
  id="upload_limit_count"
818
  value="' . $lims[0] . '"
819
  style="width:50px"
820
- title="' . esc_attr( __( 'Set the upload limit (0 means unlimited).', 'wp-photo-album-plus' ) ) . '"
821
  onchange="wppaRefreshAfter(); wppaAjaxUpdateAlbum( ' . $id . ', \'upload_limit_count\', this )"
822
  />
823
  <select onchange="wppaRefreshAfter(); wppaAjaxUpdateAlbum( ' . $id . ', \'upload_limit_time\', this )" >
@@ -848,13 +903,14 @@ global $wppa_revno;
848
  }
849
 
850
  // Tree limit
 
 
 
851
  echo __( 'Tree upload limit', 'wp-photo-album-plus' ) . ':
852
  <input
853
  type="number"
854
  min="0"
855
- title="' . esc_attr( 'The upload limit for this album and all its (grand)children. ' .
856
- 'This setting overrules all other limits that may apply to this album or its (grand)children. ' .
857
- '0 means no limit.', 'wp-photo-album-plus' ) . '"
858
  value="' . $tree_limit . '"
859
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'upload_limit_tree\', this )"
860
  style="cursor:pointer;"
@@ -868,8 +924,9 @@ global $wppa_revno;
868
  $def = __( 'default', 'wp-photo-album-plus' );
869
 
870
  // Zoomable
871
- $title = __( 'The default is set in Table IV-A37 and is currently set to', 'wp-photo-album-plus' );
872
- $title .= ' ' . ( wppa_switch( 'zoom_on' ) ? $yes : $no ) . '.';
 
873
  echo
874
  __( 'Photos are zoomable:', 'wp-photo-album-plus' ) . '
875
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'zoomable\', this )" title="' . esc_attr( $title ) . '" >
@@ -889,8 +946,9 @@ global $wppa_revno;
889
  }
890
 
891
  // Display name
892
- $title = sprintf( __( 'The defaults are set in Table II-B (%s), Table II-D (%s) and and Table II-G.', 'wp-photo-album-plus' ),
893
- ( wppa_switch( 'show_full_name' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_name' ) ? $yes : $no ) );
 
894
  echo
895
  __( 'Display photo names:', 'wp-photo-album-plus' ) . '
896
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt0\', this )" title="' . esc_attr( $title ) . '" >
@@ -900,8 +958,9 @@ global $wppa_revno;
900
  </select>';
901
 
902
  // Display description
903
- $title = sprintf( __( 'The defaults are set in Table II-B (%s), Table II-D (%s) and and Table II-G.', 'wp-photo-album-plus' ),
904
- ( wppa_switch( 'show_full_desc' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_desc' ) ? $yes : $no ) );
 
905
  echo
906
  __( 'Display photo descriptions:', 'wp-photo-album-plus' ) . '
907
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt1\', this )" title="' . esc_attr( $title ) . '" >
@@ -911,8 +970,9 @@ global $wppa_revno;
911
  </select>';
912
 
913
  // Display rating
914
- $title = sprintf( __( 'The defaults are set in Table II-B (%s), Table II-D (%s) and and Table II-G.', 'wp-photo-album-plus' ),
915
- ( wppa_switch( 'rating_on' ) ? $yes : $no ), ( wppa_switch( 'show_rating_count' ) ? $yes : $no ) );
 
916
  echo
917
  __( 'Display rating:', 'wp-photo-album-plus' ) . '
918
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt2\', this )" title="' . esc_attr( $title ) . '" >
@@ -922,7 +982,8 @@ global $wppa_revno;
922
  </select>';
923
 
924
  // Display comments
925
- $title = sprintf( __( 'The defaults are set in Table II-B (%s) and Table II-D (%s).', 'wp-photo-album-plus' ),
 
926
  ( wppa_switch( 'show_comments' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_comcount' ) ? $yes : $no ) );
927
  echo
928
  __( 'Display comments:', 'wp-photo-album-plus' ) . '
@@ -1947,9 +2008,9 @@ global $wpdb;
1947
  <thead>
1948
  <tr>
1949
  <?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&amp;order_by='; ?>
1950
- <td style="min-width: 50px;" title="<?php $show_nl ?
1951
- esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
1952
- esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
1953
  <a href="<?php echo wppa_dbg_url($url.'id') ?>">
1954
  <?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
1955
  if ($order == 'id') {
@@ -2011,7 +2072,7 @@ global $wpdb;
2011
  ?>
2012
  </a>
2013
  </td>
2014
- <td title="<?php _e('Albums/Photos/Moderation required/Scheduled', 'wp-photo-album-plus') ?>" >
2015
  <?php _e('A/P/PM/S', 'wp-photo-album-plus'); ?>
2016
  </td>
2017
  <td ><?php _e('Edit', 'wp-photo-album-plus'); ?></td>
@@ -2178,8 +2239,8 @@ global $wpdb;
2178
  ?>
2179
  </a>
2180
  </td>
2181
- <td title="<?php _e('Albums/Photos/Moderation required/Scheduled', 'wp-photo-album-plus') ?>" >
2182
- <?php _e('A/P/PM/S', 'wp-photo-album-plus'); ?>
2183
  </td>
2184
  <td ><?php _e('Edit', 'wp-photo-album-plus'); ?></td>
2185
  <td ><?php _e('Quick', 'wp-photo-album-plus'); ?></td>
@@ -2412,9 +2473,9 @@ global $wpdb;
2412
  <img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php _e('Expand subalbums', 'wp-photo-album-plus') ?>" />
2413
  </td>
2414
  <?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&amp;order_by='; ?>
2415
- <td style="min-width: 50px;" title="<?php $show_nl ?
2416
- esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2417
- esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
2418
  <a href="<?php echo wppa_dbg_url($url.'id') ?>">
2419
  <?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2420
  if ($order == 'id') {
@@ -2477,7 +2538,7 @@ global $wpdb;
2477
  ?>
2478
  </a>
2479
  </td>
2480
- <td title="<?php _e('Albums/Photos/Moderation required/Scheduled', 'wp-photo-album-plus') ?>" >
2481
  <?php _e('A/P/PM/S', 'wp-photo-album-plus'); ?>
2482
  </td>
2483
  <td ><?php _e('Edit', 'wp-photo-album-plus'); ?></td>
@@ -2519,13 +2580,13 @@ global $wpdb;
2519
  <tfoot>
2520
  <tr>
2521
  <td colspan="6" >
2522
- <img src="<?php echo wppa_get_imgdir().'backarrow.gif' ?>" style="height:16px;" title="<?php _e('Collapse subalbums', 'wp-photo-album-plus') ?>" />
2523
- <img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php _e('Expand subalbums', 'wp-photo-album-plus') ?>" />
2524
  </td>
2525
  <?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&amp;order_by='; ?>
2526
- <td style="min-width: 50px;" title="<?php $show_nl ?
2527
- esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2528
- esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
2529
  <a href="<?php echo wppa_dbg_url($url.'id') ?>">
2530
  <?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2531
  if ($order == 'id') {
@@ -3078,10 +3139,14 @@ global $wpdb;
3078
  $a_id = strval( intval( $_REQUEST['edit_id'] ) );
3079
  $photos = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->wppa_photos WHERE album = %s " . wppa_get_photo_order( $a_id ) . " LIMIT 1000", $a_id ), ARRAY_A );
3080
 
 
3081
  $output = '
3082
- <select name="wppa-main" onchange="wppaAjaxUpdateAlbum('.$a_id.', \'main_photo\', this)" >
 
 
 
3083
  <option value="0" ' . ( $cur == '0' ? 'selected="selected"' : '' ) . '>' .
3084
- __( '--- default --- See Table IV-D2', 'wp-photo-album-plus' ) . '
3085
  </option>
3086
  <option value="-9" ' . ( $cur == '-9' ? 'selected="selected"' : '' ) . '>' .
3087
  __( '--- random ---', 'wp-photo-album-plus' ) . '
@@ -3201,10 +3266,10 @@ global $wpdb;
3201
  if ( $albumorder_col != 'a_order' ) {
3202
  if ( $parent == '0') {
3203
  echo '<br />';
3204
- _e( 'You can edit top-level album sequence order here when you set the album order to "Order #" or "Order # desc" in Table IV-D1.' );
3205
  }
3206
  else {
3207
- _e( 'You can edit sub-album sequence order here when you set the album order to "Order #" or "Order # desc" in the "Sub album sort order:" selection box above.' );
3208
  }
3209
  echo '<br />';
3210
  return;
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
602
  />&nbsp;';
603
  }
604
  else {
605
+ if ( wppa_opt( 'user_upload_on' ) ) {
606
+ if ( $owner == '--- public ---' ) {
607
+ $title = __( 'Frontend upload to this album is open to visitors', 'wp-photo-album-plus' );
608
+ }
609
+ else {
610
+ $title = __( 'Frontend upload to this album is open for the owner and the admin', 'wp-photo-album-plus' );
611
+ }
612
+ }
613
+ else {
614
+ $title = '';
615
+ }
616
  echo '
617
  <select
618
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'owner\', this )"
619
+ title="' . esc_attr( $title ) . '"
620
  >';
621
  wppa_user_select( $owner );
622
  echo '
626
 
627
  // Order # -->
628
  echo
629
+ __( 'Album sequence number', 'wp-photo-album-plus' ) . ':&nbsp;
630
  <input
631
  type="text"
632
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'a_order\', this )"
636
  if ( wppa_opt( 'list_albums_by' ) != '1' && $a_order != '0' ) {
637
  echo
638
  '<small class="description" style="color:red" >' .
639
+ __( 'Album sequence number has only effect if you set the album sort order method to <b>Order #</b> in the Photo Albums -> Settings screen.<br />', 'wp-photo-album-plus' ) .
640
  '</small>' . ' ';
641
  }
642
 
643
  // Status
644
+ $title = __( 'Set the frontend visibility of the album cover and items not including sub-albums.', 'wp-photo-album-plus' ) . ' ' .
645
+ __( 'Publish: visible for all, Private: visible for logged in only, Hidden: visible for admin only', 'wp-photo-album-plus' );
646
  echo
647
  __( 'Status', 'wp-photo-album-plus' ) . ':&nbsp;
648
+ <select
649
+ onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'status\', this )"
650
+ title="' . esc_attr( $title ) . '" >
651
  <option value="publish"' . ( $status == 'publish' ? ' selected' : '' ) . ' >' .
652
  __( 'Publish', 'wp-photo-album-plus' ) . '
653
  </option>
675
  'sort' => true,
676
  'tagopen' => '<select' .
677
  ' id="wppa-parsel"' .
678
+ ' style="max-width:200px;"' .
679
  ' onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'a_parent\', this )"' .
680
  ' >',
681
  'tagid' => 'wppa-parsel',
710
  if ( ! wppa_switch( 'porder_restricted' ) || wppa_user_is( 'administrator' ) ) {
711
  echo
712
  __( 'Photo order:', 'wp-photo-album-plus' ) . ' ';
713
+ $options = array( __( '--- default ---', 'wp-photo-album-plus' ),
714
  __( 'Order #', 'wp-photo-album-plus' ),
715
  __( 'Name', 'wp-photo-album-plus' ),
716
  __( 'Random', 'wp-photo-album-plus' ),
740
  '-5',
741
  '-7'
742
  );
743
+
744
+ $dflt = '';
745
+ $df = wppa_opt( 'list_photos_by' );
746
+ if ( $df == '0' ) $dflt = __( 'not specified', 'wp-photo-album-plus' );
747
+ else foreach( array_keys( $values ) as $key ) {
748
+ if ( $df == $values[$key] ) {
749
+ $dflt = $options[$key];
750
+ }
751
+ }
752
+ $title = sprintf( __( 'The default is set in Basic settings -> Misc -> I -> Item 2 and is currently %s', 'wp-photo-album-plus' ), $dflt );
753
+
754
  echo '
755
  <select
756
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'p_order_by\', this )"
757
+ title="' . esc_attr( $title ) . '"
758
  >';
759
  foreach ( array_keys( $options ) as $key ) {
760
  $sel = $values[$key] == $p_order_by ? ' selected="selected"' : '';
766
 
767
  // Child album order
768
  $sel = ' selected="selected"';
769
+ $opts = array(
770
+ __( '--- default ---', 'wp-photo-album-plus' ),
771
+ __( 'Random', 'wp-photo-album-plus' ),
772
+ __( 'Order #', 'wp-photo-album-plus' ),
773
+ __( 'Order # reverse', 'wp-photo-album-plus' ),
774
+ __( 'Name', 'wp-photo-album-plus' ),
775
+ __( 'Name reverse', 'wp-photo-album-plus' ),
776
+ __( 'Timestamp', 'wp-photo-album-plus' ),
777
+ __( 'Timestamp reverse', 'wp-photo-album-plus' ),
778
+ );
779
+ $vals = array( '0', '3', '1', '-1', '2', '-2', '5', '-5' );
780
+
781
+ $df = wppa_opt( 'list_albums_by' );
782
+ if ( $df == '0' ) $dflt = __( 'not specified', 'wp-photo-album-plus' );
783
+ else foreach( array_keys( $values ) as $key ) {
784
+ if ( $df == $values[$key] ) {
785
+ $dflt = $options[$key];
786
+ }
787
+ }
788
+
789
+ $title = sprintf( __( 'The default is set in Basic settings -> Misc -> I -> Item 1, currently %s', 'wp-photo-album-plus' ), $dflt );
790
  echo
791
  __( 'Sub album sort order', 'wp-photo-album-plus' ) . ':&nbsp;
792
  <select
793
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'suba_order_by\', this )"
794
+ title="' . esc_attr( $title ) . '"
795
+ >';
796
+ for ( $i = 0; $i < 7; $i++ ) {
797
+ echo '<option value="' . esc_attr( $vals[$i] ) . '" ' . ( $suba_order_by == $vals[$i] ? $sel : '' ) . ' >' . $opts[$i] . '</option>';
798
+ }
799
+ echo '
 
 
 
800
  </select>&nbsp;';
801
 
802
  // Alternative thumbnail size
803
  if ( ! wppa_switch( 'alt_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
804
+ $title = sprintf( __( 'Alternate thumbnail size is set in Basic settings -> Thumbnails -> I -> Item 2 and is currently set to %s', 'wp-photo-album-plus' ), wppa_opt( 'thumbsize_alt' ) );
805
  $sel = ' selected="selected"';
806
  echo __( 'Use alt thumbsize', 'wp-photo-album-plus' ) . ':&nbsp;
807
+ <select
808
+ onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'alt_thumbsize\', this )"
809
+ title="' . esc_attr( $title ) . '"
810
+ >
811
  <option value="0"' . ( $alt_thumbsize ? '' : $sel ) . ' >' .
812
  __( 'no', 'wp-photo-album-plus' ) . '
813
  </option>
820
  // Cover type
821
  if ( ! wppa_switch( 'covertype_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
822
  $sel = ' selected="selected"';
823
+ $title = sprintf( __( 'The default is set in Basic settings -> Albums -> III -> Item 4 and is set to %s', 'wp-photo-album-plus' ), wppa_opt( 'cover_type' ) );
824
  echo
825
+ __( 'Cover&nbsp;Type', 'wp-photo-album-plus' ) . ':&nbsp;
826
+ <select
827
+ onchange="wppaAjaxUpdateAlbum( '. $id . ', \'cover_type\', this )"
828
+ title="' . esc_attr( $title ) . '"
829
+ >
830
  <option value=""' . ( $cover_type == '' ? $sel : '' ) . ' >' .
831
+ __( '--- default ---', 'wp-photo-album-plus' ) . '
832
  </option>
833
  <option value="default"' . ( $cover_type == 'default' ? $sel : '' ) . ' >' .
834
  __( 'Standard', 'wp-photo-album-plus' ) . '
853
 
854
  // Cover photo
855
  echo
856
+ __( 'Cover&nbsp;Photo:', 'wp-photo-album-plus' ) . '&nbsp;' .
857
  wppa_main_photo( $main_photo, $cover_type ) . '&nbsp;';
858
 
859
  // Upload limit
865
  }
866
  if ( wppa_user_is( 'administrator' ) ) {
867
  $sel = ' selected="selected"';
868
+ $title = __( 'Set the upload limit (0 means unlimited).', 'wp-photo-album-plus' );
869
  echo '
870
  <input
871
  type="text"
872
  id="upload_limit_count"
873
  value="' . $lims[0] . '"
874
  style="width:50px"
875
+ title="' . esc_attr( $title ) . '"
876
  onchange="wppaRefreshAfter(); wppaAjaxUpdateAlbum( ' . $id . ', \'upload_limit_count\', this )"
877
  />
878
  <select onchange="wppaRefreshAfter(); wppaAjaxUpdateAlbum( ' . $id . ', \'upload_limit_time\', this )" >
903
  }
904
 
905
  // Tree limit
906
+ $title = __( 'The upload limit for this album and all its (grand)children.', 'wp-photo-album-plus' ) . ' ' .
907
+ __( 'This setting overrules all other limits that may apply to this album or its (grand)children.', 'wp-photo-album-plus' ) . ' ' .
908
+ __( '0 means no limit.', 'wp-photo-album-plus' );
909
  echo __( 'Tree upload limit', 'wp-photo-album-plus' ) . ':
910
  <input
911
  type="number"
912
  min="0"
913
+ title="' . esc_attr( $title ) . '"
 
 
914
  value="' . $tree_limit . '"
915
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'upload_limit_tree\', this )"
916
  style="cursor:pointer;"
924
  $def = __( 'default', 'wp-photo-album-plus' );
925
 
926
  // Zoomable
927
+ $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
928
+ __( 'The default is set in Basic settings -> Photos -> I -> Item 4 and is currently set to', 'wp-photo-album-plus' ) . ' ' .
929
+ ( wppa_switch( 'zoom_on' ) ? $yes : $no ) . '.';
930
  echo
931
  __( 'Photos are zoomable:', 'wp-photo-album-plus' ) . '
932
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'zoomable\', this )" title="' . esc_attr( $title ) . '" >
946
  }
947
 
948
  // Display name
949
+ $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
950
+ sprintf( __( 'The defaults are set in Basic settings -> Slideshow -> I -> Item 17 (%s), Basic settings -> Thumbnails -> II -> Item 1 (%s) and Basic settings -> Lightbox -> I -> Item 3 (%s).', 'wp-photo-album-plus' ),
951
+ ( wppa_switch( 'show_full_name' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_name' ) ? $yes : $no ), ( wppa_switch( 'ovl_name' ) ? $yes : $no ) );
952
  echo
953
  __( 'Display photo names:', 'wp-photo-album-plus' ) . '
954
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt0\', this )" title="' . esc_attr( $title ) . '" >
958
  </select>';
959
 
960
  // Display description
961
+ $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
962
+ sprintf( __( 'The defaults are set in Basic settings -> Slideshow -> I -> Item 20 (%s), Basic settings -> Thumbnails -> II -> Item 3 (%s) and Basic settings -> Lightbox -> I -> Item 4 (%s).', 'wp-photo-album-plus' ),
963
+ ( wppa_switch( 'show_full_desc' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_desc' ) ? $yes : $no ), ( wppa_switch( 'ovl_desc' ) ? $yes : $no ) );
964
  echo
965
  __( 'Display photo descriptions:', 'wp-photo-album-plus' ) . '
966
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt1\', this )" title="' . esc_attr( $title ) . '" >
970
  </select>';
971
 
972
  // Display rating
973
+ $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
974
+ sprintf( __( 'The defaults are set in Basic settings -> Slideshow -> I -> Item 20 (%s), Basic settings -> Thumbnails -> II -> Item 3 (%s) and Basic settings -> Lightbox -> I -> Item 5 (%s).', 'wp-photo-album-plus' ),
975
+ ( wppa_switch( 'show_full_rating' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_rating' ) ? $yes : $no ), ( wppa_switch( 'ovl_rating' ) ? $yes : $no ) );
976
  echo
977
  __( 'Display rating:', 'wp-photo-album-plus' ) . '
978
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt2\', this )" title="' . esc_attr( $title ) . '" >
982
  </select>';
983
 
984
  // Display comments
985
+ $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
986
+ sprintf( __( 'The defaults are set in Basic settings -> General -> I -> Item 4 (%s) and Basic settings -> Thumbnails -> II -> Item 4, count only (%s).', 'wp-photo-album-plus' ),
987
  ( wppa_switch( 'show_comments' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_comcount' ) ? $yes : $no ) );
988
  echo
989
  __( 'Display comments:', 'wp-photo-album-plus' ) . '
2008
  <thead>
2009
  <tr>
2010
  <?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&amp;order_by='; ?>
2011
+ <td style="min-width: 50px;" title="<?php echo( $show_nl ?
2012
+ esc_attr( __( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2013
+ esc_attr( __( 'The album id', 'wp-photo-album-plus' ) ) ) ?>" >
2014
  <a href="<?php echo wppa_dbg_url($url.'id') ?>">
2015
  <?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2016
  if ($order == 'id') {
2072
  ?>
2073
  </a>
2074
  </td>
2075
+ <td title="<?php echo esc_attr( __( 'Albums/Photos/Moderation required/Scheduled', 'wp-photo-album-plus' ) ) ?>" >
2076
  <?php _e('A/P/PM/S', 'wp-photo-album-plus'); ?>
2077
  </td>
2078
  <td ><?php _e('Edit', 'wp-photo-album-plus'); ?></td>
2239
  ?>
2240
  </a>
2241
  </td>
2242
+ <td title="<?php echo esc_attr( __( 'Albums/Photos/Moderation required/Scheduled', 'wp-photo-album-plus' ) ) ?>" >
2243
+ <?php _e( 'A/P/PM/S', 'wp-photo-album-plus' ); ?>
2244
  </td>
2245
  <td ><?php _e('Edit', 'wp-photo-album-plus'); ?></td>
2246
  <td ><?php _e('Quick', 'wp-photo-album-plus'); ?></td>
2473
  <img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php _e('Expand subalbums', 'wp-photo-album-plus') ?>" />
2474
  </td>
2475
  <?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&amp;order_by='; ?>
2476
+ <td style="min-width: 50px;" title="<?php echo ( $show_nl ?
2477
+ esc_attr( __( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2478
+ esc_attr( __( 'The album id', 'wp-photo-album-plus' ) ) ) ?>" >
2479
  <a href="<?php echo wppa_dbg_url($url.'id') ?>">
2480
  <?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2481
  if ($order == 'id') {
2538
  ?>
2539
  </a>
2540
  </td>
2541
+ <td title="<?php echo esc_attr( __('Albums/Photos/Moderation required/Scheduled', 'wp-photo-album-plus') ) ?>" >
2542
  <?php _e('A/P/PM/S', 'wp-photo-album-plus'); ?>
2543
  </td>
2544
  <td ><?php _e('Edit', 'wp-photo-album-plus'); ?></td>
2580
  <tfoot>
2581
  <tr>
2582
  <td colspan="6" >
2583
+ <img src="<?php echo wppa_get_imgdir().'backarrow.gif' ?>" style="height:16px;" title="<?php echo esc_attr( __('Collapse subalbums', 'wp-photo-album-plus') ) ?>" />
2584
+ <img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php echo esc_attr( __('Expand subalbums', 'wp-photo-album-plus') ) ?>" />
2585
  </td>
2586
  <?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&amp;order_by='; ?>
2587
+ <td style="min-width: 50px;" title="<?php echo ( $show_nl ?
2588
+ esc_attr( __( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2589
+ esc_attr( __( 'The album id', 'wp-photo-album-plus' ) ) ) ?>" >
2590
  <a href="<?php echo wppa_dbg_url($url.'id') ?>">
2591
  <?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2592
  if ($order == 'id') {
3139
  $a_id = strval( intval( $_REQUEST['edit_id'] ) );
3140
  $photos = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->wppa_photos WHERE album = %s " . wppa_get_photo_order( $a_id ) . " LIMIT 1000", $a_id ), ARRAY_A );
3141
 
3142
+ $title = __( 'The default is set in Basic settings -> Misc -> I -> Item 3', 'wp-photo-album-plus' );
3143
  $output = '
3144
+ <select
3145
+ name="wppa-main" onchange="wppaAjaxUpdateAlbum('.$a_id.', \'main_photo\', this)"
3146
+ title="' . esc_attr( $title ) . '"
3147
+ >
3148
  <option value="0" ' . ( $cur == '0' ? 'selected="selected"' : '' ) . '>' .
3149
+ __( '--- default ---', 'wp-photo-album-plus' ) . '
3150
  </option>
3151
  <option value="-9" ' . ( $cur == '-9' ? 'selected="selected"' : '' ) . '>' .
3152
  __( '--- random ---', 'wp-photo-album-plus' ) . '
3266
  if ( $albumorder_col != 'a_order' ) {
3267
  if ( $parent == '0') {
3268
  echo '<br />';
3269
+ _e( 'You can edit top-level album sequence number here when you set the album sequence to "Order #" or "Order # desc" in Basic settings -> Misc -> I -> Item 1.' );
3270
  }
3271
  else {
3272
+ _e( 'You can edit sub-album sequence number here when you set the album sequence to "Order #" or "Order # desc" in the "Sub album sort order:" selection box above.' );
3273
  }
3274
  echo '<br />';
3275
  return;
wppa-album-navigator-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display album names linking to content
6
- * Version 8.0.04.004
7
  */
8
 
9
  class AlbumNavigatorWidget extends WP_Widget {
@@ -38,6 +38,7 @@ class AlbumNavigatorWidget extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
 
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
@@ -83,6 +84,7 @@ class AlbumNavigatorWidget extends WP_Widget {
83
  // Cache?
84
  if ( $cache ) {
85
  wppa_put_contents( $cachefile, $result );
 
86
  }
87
 
88
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display album names linking to content
6
+ * Version 8.0.04.005
7
  */
8
 
9
  class AlbumNavigatorWidget extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
41
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
84
  // Cache?
85
  if ( $cache ) {
86
  wppa_put_contents( $cachefile, $result );
87
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
88
  }
89
 
90
  wppa( 'in_widget', false );
wppa-album-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display thumbnail albums
6
- * Version 8.0.04.004
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -40,6 +40,7 @@ class AlbumWidget extends WP_Widget {
40
  // Cache?
41
  if ( $cache && wppa_is_file( $cachefile ) ) {
42
  echo wppa_get_contents( $cachefile );
 
43
  echo wppa_widget_timer( 'show', $widget_title, true );
44
  wppa( 'in_widget', false );
45
  return;
@@ -379,6 +380,7 @@ class AlbumWidget extends WP_Widget {
379
  // Cache?
380
  if ( wppa_checked( $instance['cache'] ) ) {
381
  wppa_put_contents( $cachefile, $result );
 
382
  }
383
 
384
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display thumbnail albums
6
+ * Version 8.0.04.005
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
40
  // Cache?
41
  if ( $cache && wppa_is_file( $cachefile ) ) {
42
  echo wppa_get_contents( $cachefile );
43
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
44
  echo wppa_widget_timer( 'show', $widget_title, true );
45
  wppa( 'in_widget', false );
46
  return;
380
  // Cache?
381
  if ( wppa_checked( $instance['cache'] ) ) {
382
  wppa_put_contents( $cachefile, $result );
383
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
384
  }
385
 
386
  wppa( 'in_widget', false );
wppa-bestof-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the best rated photos
6
- * Version 8.0.00.024
7
  *
8
  */
9
 
@@ -40,6 +40,7 @@ class BestOfWidget extends WP_Widget {
40
  // Cache?
41
  if ( $cache && wppa_is_file( $cachefile ) ) {
42
  echo wppa_get_contents( $cachefile );
 
43
  echo wppa_widget_timer( 'show', $widget_title, true );
44
  wppa( 'in_widget', false );
45
  return;
@@ -92,6 +93,7 @@ class BestOfWidget extends WP_Widget {
92
  // Cache?
93
  if ( $cache ) {
94
  wppa_put_contents( $cachefile, $result );
 
95
  }
96
 
97
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the best rated photos
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
40
  // Cache?
41
  if ( $cache && wppa_is_file( $cachefile ) ) {
42
  echo wppa_get_contents( $cachefile );
43
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
44
  echo wppa_widget_timer( 'show', $widget_title, true );
45
  wppa( 'in_widget', false );
46
  return;
93
  // Cache?
94
  if ( $cache ) {
95
  wppa_put_contents( $cachefile, $result );
96
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
97
  }
98
 
99
  wppa( 'in_widget', false );
wppa-comment-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the recent commets on photos
6
- * Version 8.0.02.006
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -43,6 +43,7 @@ class wppaCommentWidget extends WP_Widget {
43
  // Cache?
44
  if ( $cache && wppa_is_file( $cachefile ) ) {
45
  echo wppa_get_contents( $cachefile );
 
46
  echo wppa_widget_timer( 'show', $widget_title, true );
47
  wppa( 'in_widget', false );
48
  return;
@@ -126,6 +127,7 @@ class wppaCommentWidget extends WP_Widget {
126
  // Cache?
127
  if ( $cache ) {
128
  wppa_put_contents( $cachefile, $result );
 
129
  }
130
 
131
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the recent commets on photos
6
+ * Version 8.0.04.005
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
43
  // Cache?
44
  if ( $cache && wppa_is_file( $cachefile ) ) {
45
  echo wppa_get_contents( $cachefile );
46
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
47
  echo wppa_widget_timer( 'show', $widget_title, true );
48
  wppa( 'in_widget', false );
49
  return;
127
  // Cache?
128
  if ( $cache ) {
129
  wppa_put_contents( $cachefile, $result );
130
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
131
  }
132
 
133
  wppa( 'in_widget', false );
wppa-featen-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the featured photos
6
- * Version 8.0.04.004
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -40,6 +40,7 @@ class FeaTenWidget extends WP_Widget {
40
  // Cache?
41
  if ( $cache && wppa_is_file( $cachefile ) ) {
42
  echo wppa_get_contents( $cachefile );
 
43
  echo wppa_widget_timer( 'show', $widget_title, true );
44
  wppa( 'in_widget', false );
45
  return;
@@ -200,6 +201,7 @@ class FeaTenWidget extends WP_Widget {
200
  // Cache?
201
  if ( $cache ) {
202
  wppa_put_contents( $cachefile, $result );
 
203
  }
204
 
205
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the featured photos
6
+ * Version 8.0.04.005
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
40
  // Cache?
41
  if ( $cache && wppa_is_file( $cachefile ) ) {
42
  echo wppa_get_contents( $cachefile );
43
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
44
  echo wppa_widget_timer( 'show', $widget_title, true );
45
  wppa( 'in_widget', false );
46
  return;
201
  // Cache?
202
  if ( $cache ) {
203
  wppa_put_contents( $cachefile, $result );
204
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
205
  }
206
 
207
  wppa( 'in_widget', false );
wppa-functions.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various functions
6
- * Version 8.0.04.004
7
  *
8
  */
9
 
@@ -298,6 +298,7 @@ global $wppa_current_shortcode_atts;
298
  if ( $caching ) {
299
  wppa_log( 'fso', 'Writring cachefile ' . str_replace( WPPA_CONTENT_PATH, '...', $cache_file ) . ' for shortcode {b}' . $wppa_current_shortcode . '{/b}. ' );
300
  wppa_put_contents( $cache_file, $out );
 
301
  }
302
 
303
  // Done
@@ -959,7 +960,7 @@ global $wppa_current_shortcode_atts;
959
  }
960
  else wppa_out( '<span style="color:red">ERROR: Missing function wppa_theme(), check the installation of WPPA+. Remove customized wppa_theme.php</span>' );
961
  global $wppa_version;
962
- $expected_version = '8.0.04.004';
963
  if ( $wppa_version != $expected_version ) {
964
  wppa_dbg_msg( 'WARNING: customized wppa-theme.php is out of rev. Expected version: ' . $expected_version . ' found: ' . $wppa_version, 'red' );
965
  }
@@ -967,10 +968,9 @@ global $wppa_current_shortcode_atts;
967
 
968
  // Done
969
  global $wppa_empty_content;
970
- if ( $wppa_empty_content && ! wppa( 'src' ) ) {
971
- wppa_reset_occurrance();
972
  $wppa_empty_content = false;
973
- return '';
974
  }
975
  $out = str_replace( 'w#location', wppa( 'geo' ), wppa( 'out' ) );
976
 
@@ -988,6 +988,7 @@ global $wppa_current_shortcode_atts;
988
  }
989
  wppa_log( 'fso', 'Writring cachefile ' . str_replace( WPPA_CONTENT_PATH, '...', $cache_file ) . $extra );
990
  wppa_put_contents( $cache_file, $out );
 
991
  }
992
 
993
  // Reset
@@ -6035,6 +6036,7 @@ global $wppa_lang;
6035
  wppa_log( 'fso', 'Reading cachefile ' . str_replace( WPPA_CONTENT_PATH, '...', $cache_file ) );
6036
 
6037
  $cache_data = wppa_get_contents( $cache_file ) . $timer;
 
6038
  }
6039
  }
6040
  }
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various functions
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
298
  if ( $caching ) {
299
  wppa_log( 'fso', 'Writring cachefile ' . str_replace( WPPA_CONTENT_PATH, '...', $cache_file ) . ' for shortcode {b}' . $wppa_current_shortcode . '{/b}. ' );
300
  wppa_put_contents( $cache_file, $out );
301
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
302
  }
303
 
304
  // Done
960
  }
961
  else wppa_out( '<span style="color:red">ERROR: Missing function wppa_theme(), check the installation of WPPA+. Remove customized wppa_theme.php</span>' );
962
  global $wppa_version;
963
+ $expected_version = '8.0.04.005';
964
  if ( $wppa_version != $expected_version ) {
965
  wppa_dbg_msg( 'WARNING: customized wppa-theme.php is out of rev. Expected version: ' . $expected_version . ' found: ' . $wppa_version, 'red' );
966
  }
968
 
969
  // Done
970
  global $wppa_empty_content;
971
+ if ( $wppa_empty_content && ! wppa( 'src' ) && ! wppa( 'is_tag' ) && ! wppa( 'supersearch' ) ) {
 
972
  $wppa_empty_content = false;
973
+ wppa( 'out', '<!-- Nothing to display, occ = ' . wppa( 'mocc' ) . ' -->' );
974
  }
975
  $out = str_replace( 'w#location', wppa( 'geo' ), wppa( 'out' ) );
976
 
988
  }
989
  wppa_log( 'fso', 'Writring cachefile ' . str_replace( WPPA_CONTENT_PATH, '...', $cache_file ) . $extra );
990
  wppa_put_contents( $cache_file, $out );
991
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
992
  }
993
 
994
  // Reset
6036
  wppa_log( 'fso', 'Reading cachefile ' . str_replace( WPPA_CONTENT_PATH, '...', $cache_file ) );
6037
 
6038
  $cache_data = wppa_get_contents( $cache_file ) . $timer;
6039
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
6040
  }
6041
  }
6042
  }
wppa-gp-widget.php CHANGED
@@ -4,7 +4,7 @@
4
  *
5
  * A text widget that interpretes wppa shortcodes
6
  *
7
- * Version 8.0.00.024
8
  */
9
 
10
  class WppaGpWidget extends WP_Widget {
@@ -35,6 +35,7 @@ class WppaGpWidget extends WP_Widget {
35
  // Cache?
36
  if ( $cache && wppa_is_file( $cachefile ) ) {
37
  echo wppa_get_contents( $cachefile );
 
38
  echo wppa_widget_timer( 'show', $widget_title, true );
39
  wppa( 'in_widget', false );
40
  return;
@@ -74,6 +75,7 @@ class WppaGpWidget extends WP_Widget {
74
  // Cache?
75
  if ( $cache ) {
76
  wppa_put_contents( $cachefile, $result );
 
77
  }
78
 
79
  wppa( 'in_widget', false );
4
  *
5
  * A text widget that interpretes wppa shortcodes
6
  *
7
+ * Version 8.0.04.005
8
  */
9
 
10
  class WppaGpWidget extends WP_Widget {
35
  // Cache?
36
  if ( $cache && wppa_is_file( $cachefile ) ) {
37
  echo wppa_get_contents( $cachefile );
38
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
39
  echo wppa_widget_timer( 'show', $widget_title, true );
40
  wppa( 'in_widget', false );
41
  return;
75
  // Cache?
76
  if ( $cache ) {
77
  wppa_put_contents( $cachefile, $result );
78
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
79
  }
80
 
81
  wppa( 'in_widget', false );
wppa-lasten-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the last uploaded photos
6
- * Version 8.0.04.004
7
  */
8
 
9
  class LasTenWidget extends WP_Widget {
@@ -38,6 +38,7 @@ class LasTenWidget extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
 
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
@@ -211,6 +212,7 @@ class LasTenWidget extends WP_Widget {
211
  // Cache?
212
  if ( $cache ) {
213
  wppa_put_contents( $cachefile, $result );
 
214
  }
215
 
216
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the last uploaded photos
6
+ * Version 8.0.04.005
7
  */
8
 
9
  class LasTenWidget extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
41
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
212
  // Cache?
213
  if ( $cache ) {
214
  wppa_put_contents( $cachefile, $result );
215
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
216
  }
217
 
218
  wppa( 'in_widget', false );
wppa-multitag-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the multitag widget
6
- * Version 8.0.00.024
7
  *
8
  */
9
 
@@ -38,6 +38,7 @@ class MultitagPhotos extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
 
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
@@ -66,6 +67,7 @@ class MultitagPhotos extends WP_Widget {
66
  // Cache?
67
  if ( $cache ) {
68
  wppa_put_contents( $cachefile, $result );
 
69
  }
70
 
71
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the multitag widget
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
41
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
67
  // Cache?
68
  if ( $cache ) {
69
  wppa_put_contents( $cachefile, $result );
70
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
71
  }
72
 
73
  wppa( 'in_widget', false );
wppa-potd-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the photo of the day widget
6
- * Version 8.0.04.004
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -39,6 +39,7 @@ class PhotoOfTheDay extends WP_Widget {
39
  // Cache?
40
  if ( $cache && wppa_is_file( $cachefile ) ) {
41
  echo wppa_get_contents( $cachefile );
 
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
@@ -225,6 +226,7 @@ class PhotoOfTheDay extends WP_Widget {
225
  // Cache?
226
  if ( $image && $cache ) {
227
  wppa_put_contents( $cachefile, $result );
 
228
  }
229
 
230
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the photo of the day widget
6
+ * Version 8.0.04.005
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
39
  // Cache?
40
  if ( $cache && wppa_is_file( $cachefile ) ) {
41
  echo wppa_get_contents( $cachefile );
42
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
43
  echo wppa_widget_timer( 'show', $widget_title, true );
44
  wppa( 'in_widget', false );
45
  return;
226
  // Cache?
227
  if ( $image && $cache ) {
228
  wppa_put_contents( $cachefile, $result );
229
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
230
  }
231
 
232
  wppa( 'in_widget', false );
wppa-qr-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display qr code
6
- * Version 8.0.00.024
7
  */
8
 
9
  class wppaQRWidget extends WP_Widget {
@@ -37,6 +37,7 @@ class wppaQRWidget extends WP_Widget {
37
  // Cache?
38
  if ( $cache && wppa_is_file( $cachefile ) ) {
39
  echo wppa_get_contents( $cachefile );
 
40
  echo wppa_widget_timer( 'show', $widget_title, true );
41
  wppa( 'in_widget', false );
42
  return;
@@ -97,6 +98,7 @@ class wppaQRWidget extends WP_Widget {
97
  // Cache?
98
  if ( $cache ) {
99
  wppa_put_contents( $cachefile, $result );
 
100
  }
101
 
102
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display qr code
6
+ * Version 8.0.04.005
7
  */
8
 
9
  class wppaQRWidget extends WP_Widget {
37
  // Cache?
38
  if ( $cache && wppa_is_file( $cachefile ) ) {
39
  echo wppa_get_contents( $cachefile );
40
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
98
  // Cache?
99
  if ( $cache ) {
100
  wppa_put_contents( $cachefile, $result );
101
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
102
  }
103
 
104
  wppa( 'in_widget', false );
wppa-scripts.php CHANGED
@@ -593,13 +593,17 @@ global $wppa_opt;
593
  }
594
 
595
  // Nicescroller
596
- if ( ! wppa_is_mobile() ) {
597
- if ( wppa_switch( 'nicescroll' ) || wppa_switch( 'nicescroll_window' ) || wppa_switch( 'load_nicescroller' ) ) {
598
- $nice_url = WPPA_URL . '/vendor/nicescroll/jquery.nicescroll.min.js';
599
- wp_enqueue_script( 'nicescrollr-inc-nicescroll-min-js', $nice_url, array( 'jquery', 'nicescrollr-easing-min-js' ), 'all' );
600
- $easing_url = WPPA_URL . '/vendor/jquery-easing/jquery.easing.min.js';
601
- wp_enqueue_script( 'nicescrollr-easing-min-js', $easing_url, array( 'jquery' ), 'all' );
602
- }
 
 
 
 
603
  }
604
 
605
  // Panorama
593
  }
594
 
595
  // Nicescroller
596
+ if ( ! wppa_is_mobile() && ( wppa_switch( 'nicescroll' ) || wppa_switch( 'nicescroll_window' ) || wppa_switch( 'load_nicescroller' ) ) ) {
597
+ $nice_url = WPPA_URL . '/vendor/nicescroll/jquery.nicescroll.min.js';
598
+ wp_enqueue_script( 'nicescrollr-inc-nicescroll-min-js', $nice_url, array( 'jquery', 'nicescrollr-easing-min-js' ), 'all' );
599
+ $easing_url = WPPA_URL . '/vendor/jquery-easing/jquery.easing.min.js';
600
+ wp_enqueue_script( 'nicescrollr-easing-min-js', $easing_url, array( 'jquery' ), 'all' );
601
+ }
602
+
603
+ // Easing we need, borrow it from nicescroller if not already loaded
604
+ else {
605
+ $easing_url = WPPA_URL . '/vendor/jquery-easing/jquery.easing.min.js';
606
+ wp_enqueue_script( 'nicescrollr-easing-min-js', $easing_url, array( 'jquery' ), 'all' );
607
  }
608
 
609
  // Panorama
wppa-search-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the search widget
6
- * Version 8.0.00.024
7
  *
8
  */
9
 
@@ -41,6 +41,7 @@ class SearchPhotos extends WP_Widget {
41
  // Cache?
42
  if ( $cache && wppa_is_file( $cachefile ) ) {
43
  echo wppa_get_contents( $cachefile );
 
44
  echo wppa_widget_timer( 'show', $widget_title, true );
45
  wppa( 'in_widget', false );
46
  return;
@@ -71,6 +72,7 @@ class SearchPhotos extends WP_Widget {
71
  // Cache?
72
  if ( $cache ) {
73
  wppa_put_contents( $cachefile, $result );
 
74
  }
75
 
76
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the search widget
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
41
  // Cache?
42
  if ( $cache && wppa_is_file( $cachefile ) ) {
43
  echo wppa_get_contents( $cachefile );
44
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
45
  echo wppa_widget_timer( 'show', $widget_title, true );
46
  wppa( 'in_widget', false );
47
  return;
72
  // Cache?
73
  if ( $cache ) {
74
  wppa_put_contents( $cachefile, $result );
75
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
76
  }
77
 
78
  wppa( 'in_widget', false );
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 8.0.04.003
7
  *
8
  */
9
 
@@ -6488,13 +6488,13 @@ global $wppa_subtab_names;
6488
  $slug = 'wppa_ajax_method';
6489
  $opts = array( __('Normal', 'wp-photo-album-plus'),
6490
  __('Classic', 'wp-photo-album-plus'),
6491
- __('Frontend and Backend: Frontend method', 'wp-photo-album-plus'),
6492
  __('Frontend and Backend: Backend method', 'wp-photo-album-plus'),
6493
  __('Frontend: none, Backend: Backend method', 'wp-photo-album-plus'),
6494
  );
6495
  $vals = array( 'normal',
6496
  'extern',
6497
- 'wppaajax',
6498
  'admin',
6499
  'none',
6500
  );
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
6488
  $slug = 'wppa_ajax_method';
6489
  $opts = array( __('Normal', 'wp-photo-album-plus'),
6490
  __('Classic', 'wp-photo-album-plus'),
6491
+ // __('Frontend and Backend: Frontend method', 'wp-photo-album-plus'),
6492
  __('Frontend and Backend: Backend method', 'wp-photo-album-plus'),
6493
  __('Frontend: none, Backend: Backend method', 'wp-photo-album-plus'),
6494
  );
6495
  $vals = array( 'normal',
6496
  'extern',
6497
+ // 'wppaajax',
6498
  'admin',
6499
  'none',
6500
  );
wppa-slideshow-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display a slideshow in the sidebar
6
- * Version 8.0.04.004
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -46,6 +46,7 @@ class SlideshowWidget extends WP_Widget {
46
  // Cache?
47
  if ( $cache && wppa_is_file( $cachefile ) ) {
48
  echo wppa_get_contents( $cachefile );
 
49
  echo wppa_widget_timer( 'show', $widget_title, true );
50
  wppa( 'in_widget', false );
51
  return;
@@ -147,6 +148,7 @@ class SlideshowWidget extends WP_Widget {
147
  // Cache?
148
  if ( $cache ) {
149
  wppa_put_contents( $cachefile, $result );
 
150
  }
151
 
152
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display a slideshow in the sidebar
6
+ * Version 8.0.04.005
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
46
  // Cache?
47
  if ( $cache && wppa_is_file( $cachefile ) ) {
48
  echo wppa_get_contents( $cachefile );
49
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
50
  echo wppa_widget_timer( 'show', $widget_title, true );
51
  wppa( 'in_widget', false );
52
  return;
148
  // Cache?
149
  if ( $cache ) {
150
  wppa_put_contents( $cachefile, $result );
151
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
152
  }
153
 
154
  wppa( 'in_widget', false );
wppa-stats-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the stats widget
6
- * Version 8.0.00.024
7
  *
8
  */
9
  class WppaStatsWidget extends WP_Widget {
@@ -38,6 +38,7 @@ class WppaStatsWidget extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
 
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
@@ -146,6 +147,7 @@ class WppaStatsWidget extends WP_Widget {
146
  // Cache?
147
  if ( $cache ) {
148
  wppa_put_contents( $cachefile, $result );
 
149
  }
150
 
151
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the stats widget
6
+ * Version 8.0.04.005
7
  *
8
  */
9
  class WppaStatsWidget extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
41
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
147
  // Cache?
148
  if ( $cache ) {
149
  wppa_put_contents( $cachefile, $result );
150
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
151
  }
152
 
153
  wppa( 'in_widget', false );
wppa-super-view-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * ask the album / display you want
6
- * Version 8.0.00.024
7
  */
8
 
9
 
@@ -38,6 +38,7 @@ class WppaSuperView extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
 
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
@@ -47,16 +48,6 @@ class WppaSuperView extends WP_Widget {
47
  $album_root = $instance['root'];
48
  $sort = wppa_checked( $instance['sort'] ) ? true : false;
49
 
50
- // Cache?
51
- if ( $cache ) {
52
- if ( wppa_is_file( $cachefile ) ) {
53
- echo wppa_get_contents( $cachefile );
54
- echo wppa_widget_timer( 'show', $widget_title );
55
- wppa( 'in_widget', false );
56
- return;
57
- }
58
- }
59
-
60
  // Make the widget content
61
  $widget_content = '<span data-wppa="yes" ></span>' . wppa_get_superview_html( $album_root, $sort );
62
 
@@ -73,6 +64,7 @@ class WppaSuperView extends WP_Widget {
73
  // Cache?
74
  if ( $cache ) {
75
  wppa_put_contents( $cachefile, $result );
 
76
  }
77
 
78
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * ask the album / display you want
6
+ * Version 8.0.04.005
7
  */
8
 
9
 
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
41
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
48
  $album_root = $instance['root'];
49
  $sort = wppa_checked( $instance['sort'] ) ? true : false;
50
 
 
 
 
 
 
 
 
 
 
 
51
  // Make the widget content
52
  $widget_content = '<span data-wppa="yes" ></span>' . wppa_get_superview_html( $album_root, $sort );
53
 
64
  // Cache?
65
  if ( $cache ) {
66
  wppa_put_contents( $cachefile, $result );
67
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
68
  }
69
 
70
  wppa( 'in_widget', false );
wppa-tagcloud-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the tagcloud widget
6
- * Version 8.0.00.024
7
  *
8
  */
9
 
@@ -38,6 +38,7 @@ class TagcloudPhotos extends WP_Widget {
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
 
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
@@ -69,6 +70,7 @@ class TagcloudPhotos extends WP_Widget {
69
  // Cache?
70
  if ( $cache ) {
71
  wppa_put_contents( $cachefile, $result );
 
72
  }
73
 
74
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the tagcloud widget
6
+ * Version 8.0.04.005
7
  *
8
  */
9
 
38
  // Cache?
39
  if ( $cache && wppa_is_file( $cachefile ) ) {
40
  echo wppa_get_contents( $cachefile );
41
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
70
  // Cache?
71
  if ( $cache ) {
72
  wppa_put_contents( $cachefile, $result );
73
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
74
  }
75
 
76
  wppa( 'in_widget', false );
wppa-thumbnail-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display thumbnail photos
6
- * Version 8.0.00.024
7
  */
8
 
9
  class ThumbnailWidget extends WP_Widget {
@@ -37,6 +37,7 @@ class ThumbnailWidget extends WP_Widget {
37
  // Cache?
38
  if ( $cache && wppa_is_file( $cachefile ) ) {
39
  echo wppa_get_contents( $cachefile );
 
40
  echo wppa_widget_timer( 'show', $widget_title, true );
41
  wppa( 'in_widget', false );
42
  return;
@@ -158,6 +159,7 @@ class ThumbnailWidget extends WP_Widget {
158
  // Cache?
159
  if ( $cache ) {
160
  wppa_put_contents( $cachefile, $result );
 
161
  }
162
 
163
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display thumbnail photos
6
+ * Version 8.0.04.005
7
  */
8
 
9
  class ThumbnailWidget extends WP_Widget {
37
  // Cache?
38
  if ( $cache && wppa_is_file( $cachefile ) ) {
39
  echo wppa_get_contents( $cachefile );
40
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
41
  echo wppa_widget_timer( 'show', $widget_title, true );
42
  wppa( 'in_widget', false );
43
  return;
159
  // Cache?
160
  if ( $cache ) {
161
  wppa_put_contents( $cachefile, $result );
162
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
163
  }
164
 
165
  wppa( 'in_widget', false );
wppa-topten-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the top rated photos
6
- * Version 8.0.04.004
7
  */
8
 
9
  class TopTenWidget extends WP_Widget {
@@ -61,6 +61,7 @@ class TopTenWidget extends WP_Widget {
61
  // No, use it
62
  else {
63
  echo wppa_get_contents( $cachefile );
 
64
  echo wppa_widget_timer( 'show', $widget_title, true );
65
  wppa( 'in_widget', false );
66
  return;
@@ -533,6 +534,7 @@ class TopTenWidget extends WP_Widget {
533
  // Cache?
534
  if ( $cache ) {
535
  wppa_put_contents( $cachefile, $result );
 
536
  }
537
 
538
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display the top rated photos
6
+ * Version 8.0.04.005
7
  */
8
 
9
  class TopTenWidget extends WP_Widget {
61
  // No, use it
62
  else {
63
  echo wppa_get_contents( $cachefile );
64
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
65
  echo wppa_widget_timer( 'show', $widget_title, true );
66
  wppa( 'in_widget', false );
67
  return;
534
  // Cache?
535
  if ( $cache ) {
536
  wppa_put_contents( $cachefile, $result );
537
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
538
  }
539
 
540
  wppa( 'in_widget', false );
wppa-upldr-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display a list of users linking to their photos
6
- * Version 8.0.00.024
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -39,6 +39,7 @@ class UpldrWidget extends WP_Widget {
39
  // Cache?
40
  if ( $cache && wppa_is_file( $cachefile ) ) {
41
  echo wppa_get_contents( $cachefile );
 
42
  echo wppa_widget_timer( 'show', $widget_title, true );
43
  wppa( 'in_widget', false );
44
  return;
@@ -189,6 +190,7 @@ class UpldrWidget extends WP_Widget {
189
  // Cache?
190
  if ( $cache ) {
191
  wppa_put_contents( $cachefile, $result );
 
192
  }
193
 
194
  wppa( 'in_widget', false );
3
  * Package: wp-photo-album-plus
4
  *
5
  * display a list of users linking to their photos
6
+ * Version 8.0.04.005
7
  */
8
 
9
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
39
  // Cache?
40
  if ( $cache && wppa_is_file( $cachefile ) ) {
41
  echo wppa_get_contents( $cachefile );
42
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
43
  echo wppa_widget_timer( 'show', $widget_title, true );
44
  wppa( 'in_widget', false );
45
  return;
190
  // Cache?
191
  if ( $cache ) {
192
  wppa_put_contents( $cachefile, $result );
193
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
194
  }
195
 
196
  wppa( 'in_widget', false );
wppa-upload-widget.php CHANGED
@@ -4,7 +4,7 @@
4
  *
5
  * A wppa widget to upload photos
6
  *
7
- * Version 8.0.00.024
8
  */
9
 
10
  class WppaUploadWidget extends WP_Widget {
@@ -41,6 +41,7 @@ class WppaUploadWidget extends WP_Widget {
41
  // Cache?
42
  if ( $cache && wppa_is_file( $cachefile ) ) {
43
  echo wppa_get_contents( $cachefile );
 
44
  echo wppa_widget_timer( 'show', $widget_title, true );
45
  wppa( 'in_widget', false );
46
  return;
@@ -97,6 +98,7 @@ class WppaUploadWidget extends WP_Widget {
97
  // Cache?
98
  if ( $cache ) {
99
  wppa_put_contents( $cachefile, $result );
 
100
  }
101
 
102
  wppa( 'in_widget', false );
4
  *
5
  * A wppa widget to upload photos
6
  *
7
+ * Version 8.0.04.005
8
  */
9
 
10
  class WppaUploadWidget extends WP_Widget {
41
  // Cache?
42
  if ( $cache && wppa_is_file( $cachefile ) ) {
43
  echo wppa_get_contents( $cachefile );
44
+ update_option( 'wppa_cache_hits', get_option( 'wppa_cache_hits', 0 ) +1 );
45
  echo wppa_widget_timer( 'show', $widget_title, true );
46
  wppa( 'in_widget', false );
47
  return;
98
  // Cache?
99
  if ( $cache ) {
100
  wppa_put_contents( $cachefile, $result );
101
+ update_option( 'wppa_cache_misses', get_option( 'wppa_cache_misses', 0 ) +1 );
102
  }
103
 
104
  wppa( 'in_widget', false );
wppa.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Plugin Name: WP Photo Album Plus
4
  * Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5
- * Version: 8.0.04.004
6
  * Author: J.N. Breetvelt a.k.a. OpaJaap
7
  * Author URI: http://wppa.opajaap.nl/
8
  * Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
@@ -24,7 +24,7 @@ global $wp_version;
24
 
25
  /* WPPA GLOBALS */
26
  global $wppa_api_version;
27
- $wppa_api_version = '8.0.04.004'; // WPPA software version
28
  global $wppa_revno;
29
  $wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30
 
2
  /*
3
  * Plugin Name: WP Photo Album Plus
4
  * Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5
+ * Version: 8.0.04.005
6
  * Author: J.N. Breetvelt a.k.a. OpaJaap
7
  * Author URI: http://wppa.opajaap.nl/
8
  * Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
24
 
25
  /* WPPA GLOBALS */
26
  global $wppa_api_version;
27
+ $wppa_api_version = '8.0.04.005'; // WPPA software version
28
  global $wppa_revno;
29
  $wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30