WP Photo Album Plus - Version 8.2.01.004

Version Description

= 8.1.08 =

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

Release Info

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

Code changes from version 8.2.01.003 to 8.2.01.004

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.2.01.003
7
  *
8
  */
9
 
@@ -618,13 +618,14 @@ global $wppa_revno;
618
  $result .=
619
  '<small class="description" style="color:red" >' .
620
  esc_html__( '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' ) .
621
- '</small>' . $br;
622
  }
623
 
624
  // Status
625
  $title = __( 'Set the frontend visibility of the album cover and items not including sub-albums.', 'wp-photo-album-plus' ) . ' ' .
626
  __( 'Publish: visible for all, Private: visible for logged in only, Hidden: visible for admin only', 'wp-photo-album-plus' );
627
- $result .=
 
628
  __( 'Status', 'wp-photo-album-plus' ) . ':&nbsp;
629
  <select
630
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'status\', this )"
@@ -730,7 +731,7 @@ global $wppa_revno;
730
  $dflt = $options[$key];
731
  }
732
  }
733
- $title = sprintf( __( 'The default is set in Basic settings -> Misc -> I -> Item 2 and is currently %s', 'wp-photo-album-plus' ), $dflt );
734
 
735
  $result .= '
736
  <select
@@ -767,7 +768,8 @@ global $wppa_revno;
767
  }
768
  }
769
 
770
- $title = sprintf( __( 'The default is set in Basic settings -> Misc -> I -> Item 1, currently %s', 'wp-photo-album-plus' ), $dflt );
 
771
  $result .=
772
  __( 'Sub album sort order', 'wp-photo-album-plus' ) . ':&nbsp;
773
  <select
@@ -782,7 +784,8 @@ global $wppa_revno;
782
 
783
  // Alternative thumbnail size
784
  if ( ! wppa_switch( 'alt_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
785
- $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' ) );
 
786
  $sel = ' selected';
787
  $result .= __( 'Use alt thumbsize', 'wp-photo-album-plus' ) . ':&nbsp;
788
  <select
@@ -801,7 +804,7 @@ global $wppa_revno;
801
  // Cover type
802
  if ( ! wppa_switch( 'covertype_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
803
  $sel = ' selected';
804
- $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' ) );
805
  $result .=
806
  __( 'Cover&nbsp;Type', 'wp-photo-album-plus' ) . ':&nbsp;
807
  <select
@@ -906,8 +909,8 @@ global $wppa_revno;
906
 
907
  // Zoomable
908
  $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
909
- __( 'The default is set in Basic settings -> Photos -> I -> Item 4 and is currently set to', 'wp-photo-album-plus' ) . ' ' .
910
- ( wppa_switch( 'zoom_on' ) ? $yes : $no ) . '.';
911
  $result .=
912
  __( 'Photos are zoomable:', 'wp-photo-album-plus' ) . '
913
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'zoomable\', this )" title="' . esc_attr( $title ) . '" >
@@ -926,10 +929,15 @@ global $wppa_revno;
926
  }
927
  }
928
 
 
 
 
929
  // Display name
930
- $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
931
- 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' ),
932
- ( wppa_switch( 'show_full_name' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_name' ) ? $yes : $no ), ( wppa_switch( 'ovl_name' ) ? $yes : $no ) );
 
 
933
  $result .=
934
  __( 'Display photo names:', 'wp-photo-album-plus' ) . '
935
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt0\', this )" title="' . esc_attr( $title ) . '" >
@@ -939,9 +947,11 @@ global $wppa_revno;
939
  </select>' . $br;
940
 
941
  // Display description
942
- $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
943
- 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' ),
944
- ( wppa_switch( 'show_full_desc' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_desc' ) ? $yes : $no ), ( wppa_switch( 'ovl_desc' ) ? $yes : $no ) );
 
 
945
  $result .=
946
  __( 'Display photo descriptions:', 'wp-photo-album-plus' ) . '
947
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt1\', this )" title="' . esc_attr( $title ) . '" >
@@ -951,9 +961,11 @@ global $wppa_revno;
951
  </select>' . $br;
952
 
953
  // Display rating
954
- $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
955
- sprintf( __( 'The defaults are set in Basic settings -> General -> I -> Item 5 (%s), Basic settings -> Thumbnails -> II -> Item 3 (%s) and Basic settings -> Lightbox -> I -> Item 5 (%s).', 'wp-photo-album-plus' ),
956
- ( wppa_switch( 'rating_on' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_rating' ) ? $yes : $no ), ( wppa_switch( 'ovl_rating' ) ? $yes : $no ) );
 
 
957
  $result .=
958
  __( 'Display rating:', 'wp-photo-album-plus' ) . '
959
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt2\', this )" title="' . esc_attr( $title ) . '" >
@@ -963,9 +975,10 @@ global $wppa_revno;
963
  </select>' . $br;
964
 
965
  // Display comments
966
- $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
967
- 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' ),
968
- ( wppa_switch( 'show_comments' ) ? $yes : $no ), ( wppa_switch( 'thumb_text_comcount' ) ? $yes : $no ) );
 
969
  $result .=
970
  __( 'Display comments:', 'wp-photo-album-plus' ) . '
971
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt3\', this )" title="' . esc_attr( $title ) . '" >
@@ -1455,7 +1468,7 @@ global $wppa_revno;
1455
  // Create subalbum
1456
  if ( wppa_can_create_album() ) {
1457
  $url = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu&amp;tab=edit&amp;edit-id=new&amp;parent_id=' . $albuminfo['id'] . '&amp;wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) );
1458
- $onc = 'if (confirm(\''.__('Are you sure you want to create a subalbum?', 'wp-photo-album-plus' ).'\')) document.location=\''.$url.'\';';
1459
 
1460
  $result .= '
1461
  <input
@@ -1477,7 +1490,7 @@ global $wppa_revno;
1477
  '&amp;parent_id=' . $albuminfo['a_parent'] .
1478
  '&amp;is-sibling-of=' . $albuminfo['id'] .
1479
  '&amp;wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) );
1480
- $onc = 'if (confirm(\''.__('Are you sure you want to create a subalbum?', 'wp-photo-album-plus' ).'\')) document.location=\''.$url.'\';';
1481
 
1482
  $result .= '
1483
  <input
@@ -1513,7 +1526,7 @@ global $wppa_revno;
1513
  if ( current_user_can( 'wppa_upload' ) ) {
1514
 
1515
  $onc = ( $full ?
1516
- 'alert(\''.__('Change the upload limit or remove photos to enable new uploads.', 'wp-photo-album-plus' ).'\')' :
1517
  'document.location = \''.wppa_dbg_url(get_admin_url()).'/admin.php?page=wppa_upload_photos&wppa-set-album='.$id.'\''
1518
  );
1519
  $val = ( $full ?
@@ -1551,7 +1564,7 @@ global $wppa_revno;
1551
  type="button"
1552
  class="wppa-admin-button"
1553
  onclick="wppaAjaxDownloadAlbum( 0, ' . $albuminfo['id'] . ' );"
1554
- value="' . esc_attr( __('Download album', 'wp-photo-album-plus' ) ).'"
1555
  />
1556
  <img
1557
  id="dwnspin-0-' . $albuminfo['id'] . '"
@@ -1569,7 +1582,7 @@ global $wppa_revno;
1569
  type="button"
1570
  class="wppa-admin-button"
1571
  onclick="wppaTrySetAllPanorama(' . $albuminfo['id'] . ')"
1572
- value="' . esc_attr( __('Set all to panorama', 'wp-photo-album-plus' ) ).':"
1573
  />
1574
 
1575
  <select id="pano-opt">
@@ -1594,7 +1607,6 @@ global $wppa_revno;
1594
  // Subalbums sequence
1595
  wppa_album_sequence( $edit_id );
1596
 
1597
-
1598
  // Manage photos section
1599
  $result = '
1600
  <a id="manage-photos" ></a>
@@ -2193,7 +2205,7 @@ global $wpdb;
2193
  $url = wppa_ea_url( $id );
2194
  $delurl = wppa_ea_url( $id, 'del' );
2195
  $creurl = get_admin_url() . 'admin.php?page=wppa_admin_menu&amp;tab=edit&amp;edit-id=new&amp;parent_id=' . $id . '&amp;wppa-nonce=' . wp_create_nonce( 'wppa-nonce' );
2196
- $creonc = 'if (confirm(\''.esc_js(__('Are you sure you want to create a subalbum?', 'wp-photo-album-plus' )).'\')) document.location=\''.$creurl.'\';';
2197
 
2198
  $result .= '
2199
  <tr ' . $alt . ( $pendcount ? 'style="background-color:#ffdddd"' : '' ) . '>
@@ -2558,7 +2570,7 @@ global $wpdb;
2558
  }
2559
  }
2560
 
2561
-
2562
  function wppa_search_edit( $collapsible = false ) {
2563
 
2564
  $doit = false;
@@ -2622,6 +2634,7 @@ function wppa_search_edit( $collapsible = false ) {
2622
  return $result;
2623
  }
2624
 
 
2625
  function wppa_trash_edit( $collapsible = false ) {
2626
  global $wpdb;
2627
 
@@ -2669,6 +2682,7 @@ global $wpdb;
2669
  return $result;
2670
  }
2671
 
 
2672
  function wppa_album_table_pagination( $page, $count ) {
2673
  global $wpdb;
2674
 
@@ -2722,6 +2736,7 @@ global $wpdb;
2722
  return $result;
2723
  }
2724
 
 
2725
  function wppa_do_albumlist( $parent, $nestinglevel, $albums, $seq ) {
2726
  global $wpdb;
2727
 
@@ -2914,6 +2929,7 @@ global $wpdb;
2914
  }
2915
  }
2916
 
 
2917
  function wppa_have_accessible_children( $alb ) {
2918
  global $wpdb;
2919
 
@@ -2996,7 +3012,23 @@ global $wpdb;
2996
 
2997
  $cur_in_album = ( $cur < '1' ) || ( wppa_get_photo_item( $cur, 'album' ) == $a_id );
2998
 
2999
- $title = __( 'The default is set in Basic settings -> Misc -> I -> Item 3', 'wp-photo-album-plus' );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3000
  $output .= '
3001
  <select
3002
  name="wppa-main" onchange="wppaAjaxUpdateAlbum('.$a_id.', \'main_photo\', this)"
@@ -3014,26 +3046,13 @@ global $wpdb;
3014
  $output .= '
3015
  <option value="0"' . ( $cur == '0' ? ' selected' : '' ) . '>' .
3016
  __( '--- default ---', 'wp-photo-album-plus' ) . '
3017
- </option>
3018
- <option value="-9"' . ( $cur == '-9' ? ' selected' : '' ) . '>' .
3019
- __( '--- random ---', 'wp-photo-album-plus' ) . '
3020
- </option>
3021
- <option value="-1"' . ( $cur == '-1' ? ' selected' : '' ) . '>' .
3022
- __( '--- random featured ---', 'wp-photo-album-plus' ) . '
3023
- </option>
3024
- <option value="-2"' . ( $cur == '-2' ? ' selected' : '' ) . '>' .
3025
- __( '--- most recent added ---', 'wp-photo-album-plus' ) . '
3026
- </option>
3027
- <option value="-3"' . ( $cur == '-3' ? ' selected' : '' ) . '>' .
3028
- __( '--- random from (grand)children ---', 'wp-photo-album-plus' ) . '
3029
- </option>
3030
- <option value="-4"' . ( $cur == '-4' ? ' selected' : '' ) . '>' .
3031
- __( '--- most recent from (grand)children ---', 'wp-photo-album-plus' ) . '
3032
- </option>
3033
- <option value="-5"' . ( $cur == '-5' ? ' selected' : '' ) . '>' .
3034
- __( '--- according to albums photo sequence ---', 'wp-photo-album-plus' ) . '
3035
  </option>';
3036
 
 
 
 
 
 
3037
  if ( ! empty($photos) ) foreach($photos as $photo) {
3038
  if ($cur == $photo['id']) {
3039
  $selected = ' selected';
@@ -3043,7 +3062,7 @@ global $wpdb;
3043
  }
3044
  $name = __(stripslashes($photo['name']), 'wp-photo-album-plus' );
3045
  if ( strlen($name) > 45 ) $name = substr($name, 0, 45).'...';
3046
- if ( ! $name ) $name = __('Nameless, filename = ', 'wp-photo-album-plus' ).$photo['filename'];
3047
  $output .= '<option value="'.$photo['id'].'"'.$selected.'>'.$name.'</option>';
3048
  }
3049
 
@@ -3053,8 +3072,6 @@ global $wpdb;
3053
  return $output;
3054
  }
3055
 
3056
-
3057
-
3058
  // Edit (sub)album sequence
3059
  function wppa_album_sequence( $parent ) {
3060
  global $wpdb;
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
+ * Version 8.2.01.004
7
  *
8
  */
9
 
618
  $result .=
619
  '<small class="description" style="color:red" >' .
620
  esc_html__( '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' ) .
621
+ '</small>';
622
  }
623
 
624
  // Status
625
  $title = __( 'Set the frontend visibility of the album cover and items not including sub-albums.', 'wp-photo-album-plus' ) . ' ' .
626
  __( 'Publish: visible for all, Private: visible for logged in only, Hidden: visible for admin only', 'wp-photo-album-plus' );
627
+ $result .=
628
+ $br .
629
  __( 'Status', 'wp-photo-album-plus' ) . ':&nbsp;
630
  <select
631
  onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'status\', this )"
731
  $dflt = $options[$key];
732
  }
733
  }
734
+ $title = sprintf( __( 'The default is set in %s and is currently set to %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'misc', 1, 2 ), $dflt );
735
 
736
  $result .= '
737
  <select
768
  }
769
  }
770
 
771
+ $title = sprintf( __( 'The default is set in %s and is currently set to %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'misc', 1, 1 ), $dflt );
772
+
773
  $result .=
774
  __( 'Sub album sort order', 'wp-photo-album-plus' ) . ':&nbsp;
775
  <select
784
 
785
  // Alternative thumbnail size
786
  if ( ! wppa_switch( 'alt_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
787
+ $title = sprintf( __( 'The alternate thumbnail size is set in %s and is currently set to %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'thumbs', 1, 2 ), wppa_opt( 'thumbsize_alt' ) );
788
+
789
  $sel = ' selected';
790
  $result .= __( 'Use alt thumbsize', 'wp-photo-album-plus' ) . ':&nbsp;
791
  <select
804
  // Cover type
805
  if ( ! wppa_switch( 'covertype_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
806
  $sel = ' selected';
807
+ $title = sprintf( __( 'The default is set in %s and is currently set to %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'covers', 3, 4 ), wppa_opt( 'cover_type' ) );
808
  $result .=
809
  __( 'Cover&nbsp;Type', 'wp-photo-album-plus' ) . ':&nbsp;
810
  <select
909
 
910
  // Zoomable
911
  $title = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . ' ' .
912
+ sprintf( __( 'The default is set in %s and is currently %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'photos', 1, 4 ), ( wppa_switch( 'zoom_on' ) ? $yes : $no ) );
913
+
914
  $result .=
915
  __( 'Photos are zoomable:', 'wp-photo-album-plus' ) . '
916
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'zoomable\', this )" title="' . esc_attr( $title ) . '" >
929
  }
930
  }
931
 
932
+ $title_head = __( 'When set other than default, this setting will overrule the default settings.', 'wp-photo-album-plus' ) . '&#013;' .
933
+ __( 'The defaults are set in', 'wp-photo-album-plus' ). ':&#013;';
934
+
935
  // Display name
936
+ $title = $title_head .
937
+ wppa_setting_path( 'b', 'slide', 1, 17, wppa_switch( 'show_full_name' ) ? $yes : $no ) . ',&#013;' .
938
+ wppa_setting_path( 'b', 'thumbs', 2, 1, wppa_switch( 'thumb_text_name' ) ? $yes : $no ) . ' ' . __( 'and' , 'wp-photo-album-plus' ) . '&#013;' .
939
+ wppa_setting_path( 'b', 'lightbox', 1, 3, wppa_switch( 'ovl_name' ) ? $yes : $no ) . '.';
940
+
941
  $result .=
942
  __( 'Display photo names:', 'wp-photo-album-plus' ) . '
943
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt0\', this )" title="' . esc_attr( $title ) . '" >
947
  </select>' . $br;
948
 
949
  // Display description
950
+ $title = $title_head .
951
+ wppa_setting_path( 'b', 'slide', 1, 20, wppa_switch( 'show_full_desc' ) ? $yes : $no ) . ',&#013;' .
952
+ wppa_setting_path( 'b', 'thumbs', 2, 3, wppa_switch( 'thumb_text_desc' ) ? $yes : $no ) . ' ' . __( 'and' , 'wp-photo-album-plus' ) . '&#013;' .
953
+ wppa_setting_path( 'b', 'lightbox', 1, 4, wppa_switch( 'ovl_desc' ) ? $yes : $no ) . '.';
954
+
955
  $result .=
956
  __( 'Display photo descriptions:', 'wp-photo-album-plus' ) . '
957
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt1\', this )" title="' . esc_attr( $title ) . '" >
961
  </select>' . $br;
962
 
963
  // Display rating
964
+ $title = $title_head .
965
+ wppa_setting_path( 'b', 'general', 1, 5, wppa_switch( 'rating_on' ) ? $yes : $no ) . ',&#013;' .
966
+ wppa_setting_path( 'b', 'thumbs', 2, 3, wppa_switch( 'thumb_text_rating' ) ? $yes : $no ) . ' ' . __( 'and' , 'wp-photo-album-plus' ) . '&#013;' .
967
+ wppa_setting_path( 'b', 'lightbox', 1, 5, wppa_switch( 'ovl_rating' ) ? $yes : $no ) . '.';
968
+
969
  $result .=
970
  __( 'Display rating:', 'wp-photo-album-plus' ) . '
971
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt2\', this )" title="' . esc_attr( $title ) . '" >
975
  </select>' . $br;
976
 
977
  // Display comments
978
+ $title = $title_head .
979
+ wppa_setting_path( 'b', 'general', 1, 4, wppa_switch( 'show_comments' ) ? $yes : $no ) . ' ' . __( 'and' , 'wp-photo-album-plus' ) . '&#013;' .
980
+ wppa_setting_path( 'b', 'thumbs', 2, 4, wppa_switch( 'thumb_text_comcount' ) ? $yes : $no ) . '.';
981
+
982
  $result .=
983
  __( 'Display comments:', 'wp-photo-album-plus' ) . '
984
  <select onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'displayopt3\', this )" title="' . esc_attr( $title ) . '" >
1468
  // Create subalbum
1469
  if ( wppa_can_create_album() ) {
1470
  $url = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_admin_menu&amp;tab=edit&amp;edit-id=new&amp;parent_id=' . $albuminfo['id'] . '&amp;wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) );
1471
+ $onc = 'if (confirm(\''.__( 'Are you sure you want to create a subalbum?', 'wp-photo-album-plus' ).'\')) document.location=\''.$url.'\';';
1472
 
1473
  $result .= '
1474
  <input
1490
  '&amp;parent_id=' . $albuminfo['a_parent'] .
1491
  '&amp;is-sibling-of=' . $albuminfo['id'] .
1492
  '&amp;wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) );
1493
+ $onc = 'if (confirm(\''.__( 'Are you sure you want to create a subalbum?', 'wp-photo-album-plus' ).'\')) document.location=\''.$url.'\';';
1494
 
1495
  $result .= '
1496
  <input
1526
  if ( current_user_can( 'wppa_upload' ) ) {
1527
 
1528
  $onc = ( $full ?
1529
+ 'alert(\''.__( 'Change the upload limit or remove photos to enable new uploads.', 'wp-photo-album-plus' ).'\')' :
1530
  'document.location = \''.wppa_dbg_url(get_admin_url()).'/admin.php?page=wppa_upload_photos&wppa-set-album='.$id.'\''
1531
  );
1532
  $val = ( $full ?
1564
  type="button"
1565
  class="wppa-admin-button"
1566
  onclick="wppaAjaxDownloadAlbum( 0, ' . $albuminfo['id'] . ' );"
1567
+ value="' . esc_attr( __( 'Download album', 'wp-photo-album-plus' ) ).'"
1568
  />
1569
  <img
1570
  id="dwnspin-0-' . $albuminfo['id'] . '"
1582
  type="button"
1583
  class="wppa-admin-button"
1584
  onclick="wppaTrySetAllPanorama(' . $albuminfo['id'] . ')"
1585
+ value="' . esc_attr( __( 'Set all to panorama', 'wp-photo-album-plus' ) ).':"
1586
  />
1587
 
1588
  <select id="pano-opt">
1607
  // Subalbums sequence
1608
  wppa_album_sequence( $edit_id );
1609
 
 
1610
  // Manage photos section
1611
  $result = '
1612
  <a id="manage-photos" ></a>
2205
  $url = wppa_ea_url( $id );
2206
  $delurl = wppa_ea_url( $id, 'del' );
2207
  $creurl = get_admin_url() . 'admin.php?page=wppa_admin_menu&amp;tab=edit&amp;edit-id=new&amp;parent_id=' . $id . '&amp;wppa-nonce=' . wp_create_nonce( 'wppa-nonce' );
2208
+ $creonc = 'if (confirm(\''.esc_js(__( 'Are you sure you want to create a subalbum?', 'wp-photo-album-plus' )).'\')) document.location=\''.$creurl.'\';';
2209
 
2210
  $result .= '
2211
  <tr ' . $alt . ( $pendcount ? 'style="background-color:#ffdddd"' : '' ) . '>
2570
  }
2571
  }
2572
 
2573
+ // The adnin Search field
2574
  function wppa_search_edit( $collapsible = false ) {
2575
 
2576
  $doit = false;
2634
  return $result;
2635
  }
2636
 
2637
+ // The admin Trash field
2638
  function wppa_trash_edit( $collapsible = false ) {
2639
  global $wpdb;
2640
 
2682
  return $result;
2683
  }
2684
 
2685
+ // The album table pagination
2686
  function wppa_album_table_pagination( $page, $count ) {
2687
  global $wpdb;
2688
 
2736
  return $result;
2737
  }
2738
 
2739
+ // The albumlist
2740
  function wppa_do_albumlist( $parent, $nestinglevel, $albums, $seq ) {
2741
  global $wpdb;
2742
 
2929
  }
2930
  }
2931
 
2932
+ // Find accessable child albums
2933
  function wppa_have_accessible_children( $alb ) {
2934
  global $wpdb;
2935
 
3012
 
3013
  $cur_in_album = ( $cur < '1' ) || ( wppa_get_photo_item( $cur, 'album' ) == $a_id );
3014
 
3015
+ // Find default
3016
+ $setting = wppa_opt( 'main_photo' );
3017
+ $dflt = __( 'Unknown', 'wp-photo-album-plus' );
3018
+ $opts = array( __( '--- random ---', 'wp-photo-album-plus' ),
3019
+ __( '--- random featured ---', 'wp-photo-album-plus' ),
3020
+ __( '--- most recent added ---', 'wp-photo-album-plus' ),
3021
+ __( '--- random from (grand)children ---', 'wp-photo-album-plus' ),
3022
+ __( '--- most recent from (grand)children ---', 'wp-photo-album-plus' ),
3023
+ __( '--- according to albums photo sequence ---', 'wp-photo-album-plus' ),
3024
+ );
3025
+ $vals = array( '-9', '-1', '-2', '-3', '-4', '-5' );
3026
+ foreach( array_keys( $vals ) as $i ) {
3027
+ if ( $vals[$i] == $setting ) $dflt = $opts[$i];
3028
+ }
3029
+
3030
+ $title = sprintf( __( 'The default is set in %s and is currently %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'misc', 1, 3 ), $dflt );
3031
+
3032
  $output .= '
3033
  <select
3034
  name="wppa-main" onchange="wppaAjaxUpdateAlbum('.$a_id.', \'main_photo\', this)"
3046
  $output .= '
3047
  <option value="0"' . ( $cur == '0' ? ' selected' : '' ) . '>' .
3048
  __( '--- default ---', 'wp-photo-album-plus' ) . '
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3049
  </option>';
3050
 
3051
+ foreach( array_keys( $opts ) as $key ) {
3052
+ $output .= '
3053
+ <option value="' . $vals[$key] . '"' . ( $cur == $vals[$key] ? ' selected' : '' ) . '>' . $opts[$key] . '</option>';
3054
+ }
3055
+
3056
  if ( ! empty($photos) ) foreach($photos as $photo) {
3057
  if ($cur == $photo['id']) {
3058
  $selected = ' selected';
3062
  }
3063
  $name = __(stripslashes($photo['name']), 'wp-photo-album-plus' );
3064
  if ( strlen($name) > 45 ) $name = substr($name, 0, 45).'...';
3065
+ if ( ! $name ) $name = __( 'Nameless, filename = ', 'wp-photo-album-plus' ).$photo['filename'];
3066
  $output .= '<option value="'.$photo['id'].'"'.$selected.'>'.$name.'</option>';
3067
  }
3068
 
3072
  return $output;
3073
  }
3074
 
 
 
3075
  // Edit (sub)album sequence
3076
  function wppa_album_sequence( $parent ) {
3077
  global $wpdb;
wppa-help.php CHANGED
@@ -3,7 +3,7 @@
3
  * Pachkage: wp-photo-album-plus
4
  *
5
  * admin help page
6
- * version 8.1.10.001
7
  */
8
 
9
  function _wppa_page_help() {
@@ -20,7 +20,8 @@ global $wppa_revno;
20
  __( 'Thanx to R.J. Kaplan for WP Photo Album 1.5.1.', 'wp-photo-album-plus' ) . '<br>' .
21
  __( 'Thanx to E.S. Rosenberg for programming tips on security issues.', 'wp-photo-album-plus' ) . '<br>' .
22
  __( 'Thanx to Pavel &#352;orejs for the Numbar code.', 'wp-photo-album-plus' ) . '<br>' .
23
- __( 'Thanx to Alejandro Giraldez Sanches who inspired me to implement the display of spherical panoramic images', 'wp-photo-album-plus' ) . '<br>' .
 
24
  __( 'Thanx to the users who reported bugs and asked for enhancements. Without them WPPA should not have been what it is now!', 'wp-photo-album-plus' ) . '<br>
25
  </p>
26
 
3
  * Pachkage: wp-photo-album-plus
4
  *
5
  * admin help page
6
+ * version 8.2.01.004
7
  */
8
 
9
  function _wppa_page_help() {
20
  __( 'Thanx to R.J. Kaplan for WP Photo Album 1.5.1.', 'wp-photo-album-plus' ) . '<br>' .
21
  __( 'Thanx to E.S. Rosenberg for programming tips on security issues.', 'wp-photo-album-plus' ) . '<br>' .
22
  __( 'Thanx to Pavel &#352;orejs for the Numbar code.', 'wp-photo-album-plus' ) . '<br>' .
23
+ __( 'Thanx to Alejandro Giraldez Sanches who inspired me to implement the display of spherical panoramic images.', 'wp-photo-album-plus' ) . '<br>' .
24
+ __( 'Thanx to Stefan Eggers who pointed me to many typos and other textual errors/inconsistencies as well as giving me various usefull coding suggestions.', 'wp-photo-album-plus' ) . '<br>' .
25
  __( 'Thanx to the users who reported bugs and asked for enhancements. Without them WPPA should not have been what it is now!', 'wp-photo-album-plus' ) . '<br>
26
  </p>
27
 
wppa-photo-admin-autosave.php CHANGED
@@ -78,13 +78,7 @@ global $wpdb;
78
  $count = wppa_get_edit_search_photos( '', '', 'count_only' );
79
  $photos = wppa_get_edit_search_photos( $skip, $pagesize );
80
 
81
- $link = wppa_dbg_url( get_admin_url() . 'admin.php' .
82
- '?page=wppa_admin_menu' .
83
- '&tab=edit' .
84
- '&edit-id=' . $album .
85
- '&wppa-nonce=' . wp_create_nonce('wppa-nonce') .
86
- '&wppa-searchstring=' . wppa_get( 'searchstring' )
87
- );
88
  }
89
 
90
  // Edit trashed photos
@@ -93,12 +87,7 @@ global $wpdb;
93
  WHERE album < '0' ORDER BY modified DESC
94
  LIMIT %d, %d", $skip, $pagesize ), ARRAY_A );
95
  $count = is_array( $photos ) ? count( $photos ) : 0;
96
- $link = wppa_dbg_url( get_admin_url() . 'admin.php' .
97
- '?page=wppa_admin_menu' .
98
- '&tab=edit' .
99
- '&edit-id=trash' .
100
- '&wppa-nonce=' . wp_create_nonce('wppa-nonce')
101
- );
102
  }
103
 
104
  // A single photo
@@ -120,12 +109,7 @@ global $wpdb;
120
  " . wppa_get_photo_order( $album, 'no_random' ) . "
121
  LIMIT %d, %d", $album, $skip, $pagesize ), ARRAY_A );
122
 
123
- $link = wppa_dbg_url( get_admin_url() . 'admin.php' .
124
- '?page=wppa_admin_menu' .
125
- '&tab=edit' .
126
- '&edit-id=' . $album .
127
- '&wppa-nonce=' . wp_create_nonce('wppa-nonce')
128
- );
129
  }
130
  }
131
 
@@ -144,7 +128,7 @@ global $wpdb;
144
  ORDER BY timestamp DESC
145
  LIMIT %d, %d", $owner, $skip, $pagesize ), ARRAY_A );
146
  $count = is_array( $photos ) ? count( $photos ) : 0;
147
- $link = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_edit_photo&wppa-nonce=' . wp_create_nonce('wppa-nonce') );
148
  }
149
 
150
  // Moderate photos
@@ -181,7 +165,7 @@ global $wpdb;
181
  }
182
  $count = count( $photos );
183
  }
184
- $link = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_moderate_photos&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) );
185
  }
186
 
187
  // Are there photos to moderate?
@@ -215,7 +199,7 @@ global $wpdb;
215
  LIMIT %d, %d", $skip, $pagesize ), ARRAY_A );
216
 
217
  $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos" );
218
- $link = wppa_dbg_url( get_admin_url() . 'admin.php?page=wppa_moderate_photos&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) );
219
  }
220
 
221
  // Nothing to do
@@ -238,7 +222,7 @@ global $wpdb;
238
  // In case it is a seaerch and edit, show the search statistics
239
  wppa_show_search_statistics();
240
 
241
- // If no photos selected produce apprpriate message and quit
242
  if ( empty( $photos ) ) {
243
 
244
  // A specific photo requested
@@ -489,7 +473,6 @@ function wppaToggleExif( id, count ) {
489
  $cvt = esc_attr( __( 'Copy video', 'wp-photo-album-plus' ) );
490
  $cpt = esc_attr( __( 'Copy photo', 'wp-photo-album-plus' ) );
491
 
492
-
493
  // Display the pagelinks
494
  wppa_admin_page_links( $page, $pagesize, $count, $link );
495
 
@@ -547,6 +530,8 @@ function wppaToggleExif( id, count ) {
547
  $has_audio = wppa_has_audio( $id ); // returns array of extensions
548
  $b_has_audio = empty( $has_audio ) ? 0 : 1; // boolean
549
 
 
 
550
  // Various usefull vars
551
  $owner_editable = wppa_switch( 'photo_owner_change' ) && wppa_user_is( 'administrator' );
552
  switch ( wppa_get_album_item( $album, 'p_order_by' ) ) {
@@ -565,8 +550,6 @@ function wppaToggleExif( id, count ) {
565
  'cenlft' => __( 'center - left' , 'wp-photo-album-plus' ), 'cencen' => __( 'center - center' , 'wp-photo-album-plus' ), 'cenrht' => __( 'center - right' , 'wp-photo-album-plus' ),
566
  'botlft' => __( 'bottom - left' , 'wp-photo-album-plus' ), 'botcen' => __( 'bottom - center' , 'wp-photo-album-plus' ), 'botrht' => __( 'bottom - right' , 'wp-photo-album-plus' ), );
567
 
568
- $br = wppa_is_phone() ? '<br>' : ' ';
569
-
570
  // Album for moderate
571
  if ( $modalbum != $album && $album && ! wppa_get( 'just-edit' ) && wppa_get( 'edit-id' ) != 'trash' ) {
572
  wppa_echo( '<h3>' . sprintf( __( 'Edit/Moderate photos from album %s by %s', 'wp-photo-album-plus' ),
@@ -587,8 +570,7 @@ function wppaToggleExif( id, count ) {
587
  >' .
588
 
589
  // Photo specific nonce field
590
- '
591
- <input
592
  type="hidden"
593
  id="photo-nonce-' . $id . '"
594
  value="' . wp_create_nonce( 'wppa-nonce_' . $id ) . '"
@@ -851,12 +833,10 @@ function wppaToggleExif( id, count ) {
851
  }
852
 
853
  // Downloads
854
- // if ( true ) {
855
- wppa_echo(
856
- __( 'Downloads', 'wp-photo-album-plus' ) . ': ' .
857
- htmlspecialchars( $dlcount ) .
858
- '.' . $br );
859
- // }
860
 
861
  // Status
862
  wppa_echo( '<br>' .
@@ -869,36 +849,35 @@ function wppaToggleExif( id, count ) {
869
  $dis = '';
870
  }
871
  $sel = ' selected';
872
- wppa_echo(
873
- '<select' .
874
- ' id="status-' . $id . '"' .
875
- ' onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'status\', this.value); wppaPhotoStatusChange( ' . $id . ' )"' .
876
- ' >' .
877
- '<option value="pending"' . ( $status == 'pending' ? $sel : '' ) . ' >' .
878
- __( 'Pending', 'wp-photo-album-plus' ) .
879
- '</option>' .
880
- '<option value="publish"' . ( $status =='publish' ? $sel : '' ) . ' >' .
881
- __( 'Publish', 'wp-photo-album-plus' ) .
882
- '</option>' .
883
- '<option value="featured"' . ( $status == 'featured' ? $sel : '' ) . $dis . ' >' .
884
- __( 'Featured', 'wp-photo-album-plus' ) .
885
- '</option>' .
886
- '<option value="gold"' . ( $status == 'gold' ? $sel : '' ) . $dis . ' >' .
887
- __( 'Gold', 'wp-photo-album-plus' ) .
888
- '</option>' .
889
- '<option value="silver"' . ( $status == 'silver' ? $sel : '' ) . $dis . ' >' .
890
- __( 'Silver', 'wp-photo-album-plus' ) .
891
- '</option>' .
892
- '<option value="bronze"' . ( $status == 'bronze' ? $sel : '' ) . $dis . ' >' .
893
- __( 'Bronze', 'wp-photo-album-plus' ) .
894
- '</option>' .
895
- '<option value="scheduled"' . ( $status == 'scheduled' ? $sel : '' ) . $dis . ' >' .
896
- __( 'Scheduled', 'wp-photo-album-plus' ) .
897
- '</option>' .
898
- '<option value="private"' . ( $status == 'private' ? $sel : '' ) . $dis . ' >' .
899
- __( 'Private', 'wp-photo-album-plus' ) .
900
- '</option>' .
901
- '</select>' .
902
  wppa_get_date_time_select_html( 'photo', $id, true ) );
903
  }
904
  else {
@@ -1174,7 +1153,7 @@ function wppaToggleExif( id, count ) {
1174
  __( 'Right - left stereo image', 'wp-photo-album-plus' ) .
1175
  '</option>' .
1176
  '</select>' .
1177
- ' ' .
1178
  __( 'Images:', 'wp-photo-album-plus' ) . ' ' );
1179
  $files = wppa_glob( WPPA_UPLOAD_PATH . '/stereo/' . $id . '-*.*' );
1180
 
@@ -1894,18 +1873,18 @@ function wppaToggleExif( id, count ) {
1894
  '</td>' .
1895
  '</tr>' );
1896
 
1897
- // Description
1898
  if ( ! wppa_switch( 'desc_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
1899
- wppa_echo(
1900
- '<tr>' .
1901
- '<td>' .
1902
- __( 'Description:', 'wp-photo-album-plus' ) .
1903
- '</td>' );
1904
 
 
1905
  if ( wppa_switch( 'use_wp_editor' ) ) {
1906
  $alfaid = wppa_alfa_id( $id );
1907
- echo
1908
- '<td>';
1909
  wp_editor( $description,
1910
  'wppaphotodesc'.$alfaid,
1911
  array( 'wpautop' => true,
@@ -1914,78 +1893,83 @@ function wppaToggleExif( id, count ) {
1914
  'tinymce' => true
1915
  )
1916
  );
1917
- echo
1918
- '</td>' .
1919
- '<td>' .
1920
- '<input' .
1921
- ' type="button"' .
1922
- ' class="button-secundary"' .
1923
- ' value="' . esc_attr( __( 'Update Photo description', 'wp-photo-album-plus' ) ) . '"' .
1924
- ' onclick="wppaAjaxUpdatePhoto( ' . $id . ', \'description\', wppaGetTinyMceContent(\'wppaphotodesc'.$alfaid.'\') )"' .
1925
- ' />' .
1926
- '<img' .
1927
- ' id="wppa-photo-spin-' . $id . '"' .
1928
- ' src="' . wppa_get_imgdir() . 'spinner.gif"' .
1929
- ' style="visibility:hidden"' .
1930
- ' />' .
1931
- '</td>';
 
1932
  }
1933
 
 
1934
  else {
1935
-
1936
- wppa_echo(
1937
- '<td>' .
1938
- '<textarea' .
1939
- ' style="width:100%;height:60px"' .
1940
- ' onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'description\', this.value)"' .
1941
- ' >' .
1942
- esc_textarea( stripslashes( $description ) ) .
1943
- '</textarea>' .
1944
- '</td>' .
1945
- '<td>' .
1946
- '</td>' );
1947
  }
1948
 
1949
  wppa_echo( '</tr>' );
1950
  }
 
 
1951
  else {
1952
- wppa_echo(
1953
- '<tr>' .
1954
- '<td>' .
1955
- __( 'Description:', 'wp-photo-album-plus' ) .
1956
- '</td>' .
1957
- '<td>' .
1958
- esc_html( $description ) .
1959
- '</td>' .
1960
- '<td>' .
1961
- '</td>' .
1962
- '</tr>' );
1963
  }
1964
 
1965
  // Tags
1966
  $allowed = ! wppa_switch( 'newtags_is_restricted' ) || wppa_user_is( 'administrator' );
1967
- wppa_echo(
1968
- '<tr>' .
1969
- '<td>' .
1970
- __( 'Tags:', 'wp-photo-album-plus' ) .
1971
- '</td>' .
1972
- '<td>' .
1973
- '<input' .
1974
- ' id="tags-' . $id . '"' .
1975
- ' type="text"' .
1976
- ' style="width:100%"' .
1977
- ' onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'tags\', this.value)"' .
1978
- ' value="' . $tags . '"' .
1979
- ( $allowed ? '' : ' readonly="readonly"' ) .
1980
- ' />' .
1981
- ( $allowed ?
1982
- '<br>' .
1983
- '<span class="description">' .
1984
- __( 'Separate tags with commas.', 'wp-photo-album-plus' ) .
1985
- '</span>' : '' ) .
1986
- '<select' .
1987
- ' onchange="wppaAddTag( this.value, \'tags-' . $id . '\' ); wppaAjaxUpdatePhoto( ' . $id . ', \'tags\', document.getElementById( \'tags-' . $id . '\' ).value )"' .
1988
- ' >' );
 
 
1989
 
1990
  if ( wppa_switch( 'predef_tags_only' ) ) {
1991
  $keys = explode( ',', trim( wppa_opt( 'minimum_tags' ) ) );
@@ -2010,12 +1994,12 @@ function wppaToggleExif( id, count ) {
2010
  else {
2011
  wppa_echo( '<option value="0">' . __( 'No tags yet', 'wp-photo-album-plus' ) . '</option>' );
2012
  }
2013
- wppa_echo(
2014
- '</select>' .
2015
- '</td>' .
2016
- '<td>' .
2017
- '</td>' .
2018
- '</tr>' );
2019
 
2020
  // Custom
2021
  if ( wppa_switch( 'custom_fields' ) ) {
78
  $count = wppa_get_edit_search_photos( '', '', 'count_only' );
79
  $photos = wppa_get_edit_search_photos( $skip, $pagesize );
80
 
81
+ $link = get_admin_url() . 'admin.php?page=wppa_admin_menu&tab=edit&edit-id=' . $album . '&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' ) . '&wppa-searchstring=' . wppa_get( 'searchstring' );
 
 
 
 
 
 
82
  }
83
 
84
  // Edit trashed photos
87
  WHERE album < '0' ORDER BY modified DESC
88
  LIMIT %d, %d", $skip, $pagesize ), ARRAY_A );
89
  $count = is_array( $photos ) ? count( $photos ) : 0;
90
+ $link = get_admin_url() . 'admin.php?page=wppa_admin_menu&tab=edit&edit-id=trash&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' );
 
 
 
 
 
91
  }
92
 
93
  // A single photo
109
  " . wppa_get_photo_order( $album, 'no_random' ) . "
110
  LIMIT %d, %d", $album, $skip, $pagesize ), ARRAY_A );
111
 
112
+ $link = get_admin_url() . 'admin.php?page=wppa_admin_menu&tab=edit&edit-id=' . $album . '&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' );
 
 
 
 
 
113
  }
114
  }
115
 
128
  ORDER BY timestamp DESC
129
  LIMIT %d, %d", $owner, $skip, $pagesize ), ARRAY_A );
130
  $count = is_array( $photos ) ? count( $photos ) : 0;
131
+ $link = get_admin_url() . 'admin.php?page=wppa_edit_photo&wppa-nonce=' . wp_create_nonce('wppa-nonce');
132
  }
133
 
134
  // Moderate photos
165
  }
166
  $count = count( $photos );
167
  }
168
+ $link = get_admin_url() . 'admin.php?page=wppa_moderate_photos&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' );
169
  }
170
 
171
  // Are there photos to moderate?
199
  LIMIT %d, %d", $skip, $pagesize ), ARRAY_A );
200
 
201
  $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->wppa_photos" );
202
+ $link = get_admin_url() . 'admin.php?page=wppa_moderate_photos&wppa-nonce=' . wp_create_nonce( 'wppa-nonce' );
203
  }
204
 
205
  // Nothing to do
222
  // In case it is a seaerch and edit, show the search statistics
223
  wppa_show_search_statistics();
224
 
225
+ // If no photos selected produce appropriate message and quit
226
  if ( empty( $photos ) ) {
227
 
228
  // A specific photo requested
473
  $cvt = esc_attr( __( 'Copy video', 'wp-photo-album-plus' ) );
474
  $cpt = esc_attr( __( 'Copy photo', 'wp-photo-album-plus' ) );
475
 
 
476
  // Display the pagelinks
477
  wppa_admin_page_links( $page, $pagesize, $count, $link );
478
 
530
  $has_audio = wppa_has_audio( $id ); // returns array of extensions
531
  $b_has_audio = empty( $has_audio ) ? 0 : 1; // boolean
532
 
533
+ $br = wppa_is_phone() ? '<br>' : ' ';
534
+
535
  // Various usefull vars
536
  $owner_editable = wppa_switch( 'photo_owner_change' ) && wppa_user_is( 'administrator' );
537
  switch ( wppa_get_album_item( $album, 'p_order_by' ) ) {
550
  'cenlft' => __( 'center - left' , 'wp-photo-album-plus' ), 'cencen' => __( 'center - center' , 'wp-photo-album-plus' ), 'cenrht' => __( 'center - right' , 'wp-photo-album-plus' ),
551
  'botlft' => __( 'bottom - left' , 'wp-photo-album-plus' ), 'botcen' => __( 'bottom - center' , 'wp-photo-album-plus' ), 'botrht' => __( 'bottom - right' , 'wp-photo-album-plus' ), );
552
 
 
 
553
  // Album for moderate
554
  if ( $modalbum != $album && $album && ! wppa_get( 'just-edit' ) && wppa_get( 'edit-id' ) != 'trash' ) {
555
  wppa_echo( '<h3>' . sprintf( __( 'Edit/Moderate photos from album %s by %s', 'wp-photo-album-plus' ),
570
  >' .
571
 
572
  // Photo specific nonce field
573
+ '<input
 
574
  type="hidden"
575
  id="photo-nonce-' . $id . '"
576
  value="' . wp_create_nonce( 'wppa-nonce_' . $id ) . '"
833
  }
834
 
835
  // Downloads
836
+ wppa_echo(
837
+ __( 'Downloads', 'wp-photo-album-plus' ) . ': ' .
838
+ htmlspecialchars( $dlcount ) .
839
+ '.' . $br );
 
 
840
 
841
  // Status
842
  wppa_echo( '<br>' .
849
  $dis = '';
850
  }
851
  $sel = ' selected';
852
+ wppa_echo( '
853
+ <select
854
+ id="status-' . $id . '"
855
+ onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'status\', this.value); wppaPhotoStatusChange( ' . $id . ' )">
856
+ <option value="pending"' . ( $status == 'pending' ? $sel : '' ) . ' >' .
857
+ __( 'Pending', 'wp-photo-album-plus' ) . '
858
+ </option>
859
+ <option value="publish"' . ( $status =='publish' ? $sel : '' ) . ' >' .
860
+ __( 'Publish', 'wp-photo-album-plus' ) . '
861
+ </option>
862
+ <option value="featured"' . ( $status == 'featured' ? $sel : '' ) . $dis . ' >' .
863
+ __( 'Featured', 'wp-photo-album-plus' ) . '
864
+ </option>
865
+ <option value="gold"' . ( $status == 'gold' ? $sel : '' ) . $dis . ' >' .
866
+ __( 'Gold', 'wp-photo-album-plus' ) . '
867
+ </option>
868
+ <option value="silver"' . ( $status == 'silver' ? $sel : '' ) . $dis . ' >' .
869
+ __( 'Silver', 'wp-photo-album-plus' ) . '
870
+ </option>
871
+ <option value="bronze"' . ( $status == 'bronze' ? $sel : '' ) . $dis . ' >' .
872
+ __( 'Bronze', 'wp-photo-album-plus' ) . '
873
+ </option>
874
+ <option value="scheduled"' . ( $status == 'scheduled' ? $sel : '' ) . $dis . ' >' .
875
+ __( 'Scheduled', 'wp-photo-album-plus' ) . '
876
+ </option>
877
+ <option value="private"' . ( $status == 'private' ? $sel : '' ) . $dis . ' >' .
878
+ __( 'Private', 'wp-photo-album-plus' ) . '
879
+ </option>
880
+ </select>' .
 
881
  wppa_get_date_time_select_html( 'photo', $id, true ) );
882
  }
883
  else {
1153
  __( 'Right - left stereo image', 'wp-photo-album-plus' ) .
1154
  '</option>' .
1155
  '</select>' .
1156
+ ' ' . $br .
1157
  __( 'Images:', 'wp-photo-album-plus' ) . ' ' );
1158
  $files = wppa_glob( WPPA_UPLOAD_PATH . '/stereo/' . $id . '-*.*' );
1159
 
1873
  '</td>' .
1874
  '</tr>' );
1875
 
1876
+ // Description editable
1877
  if ( ! wppa_switch( 'desc_is_restricted' ) || wppa_user_is( 'administrator' ) ) {
1878
+ wppa_echo( '
1879
+ <tr>
1880
+ <td>' .
1881
+ __( 'Description:', 'wp-photo-album-plus' ) . '
1882
+ </td>' );
1883
 
1884
+ // WP editor
1885
  if ( wppa_switch( 'use_wp_editor' ) ) {
1886
  $alfaid = wppa_alfa_id( $id );
1887
+ wppa_echo( '<td>' );
 
1888
  wp_editor( $description,
1889
  'wppaphotodesc'.$alfaid,
1890
  array( 'wpautop' => true,
1893
  'tinymce' => true
1894
  )
1895
  );
1896
+ wppa_echo( '
1897
+ <input
1898
+ type="button"
1899
+ style="clear:left"
1900
+ class="button-secundary"
1901
+ value="' . esc_attr( __( 'Update Photo description', 'wp-photo-album-plus' ) ) . '"
1902
+ onclick="wppaAjaxUpdatePhoto( ' . $id . ', \'description\', wppaGetTinyMceContent(\'wppaphotodesc' . $alfaid . '\') )"
1903
+ />
1904
+ <img
1905
+ id="wppa-photo-spin-' . $id . '"
1906
+ src="' . wppa_get_imgdir() . 'spinner.gif"
1907
+ style="visibility:hidden"
1908
+ />
1909
+ </td>
1910
+ <td>
1911
+ </td>' );
1912
  }
1913
 
1914
+ // Textarea
1915
  else {
1916
+ wppa_echo( '
1917
+ <td>
1918
+ <textarea
1919
+ style="width:100%;height:60px"
1920
+ onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'description\', this.value)"
1921
+ >' .
1922
+ esc_textarea( stripslashes( $description ) ) . '
1923
+ </textarea>
1924
+ </td>
1925
+ <td>
1926
+ </td>' );
 
1927
  }
1928
 
1929
  wppa_echo( '</tr>' );
1930
  }
1931
+
1932
+ // Description not editable
1933
  else {
1934
+ wppa_echo( '
1935
+ <tr>
1936
+ <td>' .
1937
+ __( 'Description:', 'wp-photo-album-plus' ) . '
1938
+ </td>
1939
+ <td>' .
1940
+ wp_check_invalid_utf8( $description ) . '
1941
+ </td>
1942
+ <td>
1943
+ </td>
1944
+ </tr>' );
1945
  }
1946
 
1947
  // Tags
1948
  $allowed = ! wppa_switch( 'newtags_is_restricted' ) || wppa_user_is( 'administrator' );
1949
+ wppa_echo( '
1950
+ <tr>
1951
+ <td>' .
1952
+ __( 'Tags:', 'wp-photo-album-plus' ) . '
1953
+ </td>
1954
+ <td>
1955
+ <input
1956
+ id="tags-' . $id . '"
1957
+ type="text"
1958
+ style="width:100%"
1959
+ onchange="wppaAjaxUpdatePhoto( ' . $id . ', \'tags\', this.value)"
1960
+ value="' . esc_attr( $tags ) . '"' .
1961
+ ( $allowed ? '' : ' readonly="readonly"' ) . '
1962
+ />' );
1963
+ if ( $allowed ) {
1964
+ wppa_echo( '
1965
+ <br>
1966
+ <span class="description">' .
1967
+ __( 'Separate tags with commas.', 'wp-photo-album-plus' ) . '
1968
+ </span>' );
1969
+ }
1970
+ wppa_echo( '
1971
+ <select
1972
+ onchange="wppaAddTag( this.value, \'tags-' . $id . '\' ); wppaAjaxUpdatePhoto( ' . $id . ', \'tags\', document.getElementById( \'tags-' . $id . '\' ).value )">' );
1973
 
1974
  if ( wppa_switch( 'predef_tags_only' ) ) {
1975
  $keys = explode( ',', trim( wppa_opt( 'minimum_tags' ) ) );
1994
  else {
1995
  wppa_echo( '<option value="0">' . __( 'No tags yet', 'wp-photo-album-plus' ) . '</option>' );
1996
  }
1997
+ wppa_echo( '
1998
+ </select>
1999
+ </td>
2000
+ <td>
2001
+ </td>
2002
+ </tr>' );
2003
 
2004
  // Custom
2005
  if ( wppa_switch( 'custom_fields' ) ) {
wppa-setting-functions.php CHANGED
@@ -69,7 +69,7 @@ global $wppa_opt;
69
  $tit = __('Slug =', 'wp-photo-album-plus' ).' '.$xslug;
70
  $title = wppa_switch( 'enable_shortcode_wppa_set' ) ? ' title="'.esc_attr( $tit ).'"' : '';
71
  $val = isset ( $wppa_opt[ $xslug ] ) ? esc_attr( $wppa_opt[ $xslug ] ) : wppa_get_option( $xslug, '' );
72
- $html = '<input'.$title.' type="color" style="float:left;width:'.$width.';height:20px;padding:0 0 0 5px;';
73
  if ($minwidth != '') $html .= 'min-width:'.$minwidth.';';
74
  $html .= 'font-size:11px;margin:0px" type="text" id="'.$slug.'"';
75
  if ($onchange != '') $html .= ' onchange="'.esc_attr($onchange.';wppaAjaxUpdateOptionValue(\''.$slug.'\', this);').'"';
69
  $tit = __('Slug =', 'wp-photo-album-plus' ).' '.$xslug;
70
  $title = wppa_switch( 'enable_shortcode_wppa_set' ) ? ' title="'.esc_attr( $tit ).'"' : '';
71
  $val = isset ( $wppa_opt[ $xslug ] ) ? esc_attr( $wppa_opt[ $xslug ] ) : wppa_get_option( $xslug, '' );
72
+ $html = '<input'.$title.' type="color" style="float:left;width:'.$width.';height:20px;padding:0;';
73
  if ($minwidth != '') $html .= 'min-width:'.$minwidth.';';
74
  $html .= 'font-size:11px;margin:0px" type="text" id="'.$slug.'"';
75
  if ($onchange != '') $html .= ' onchange="'.esc_attr($onchange.';wppaAjaxUpdateOptionValue(\''.$slug.'\', this);').'"';
wppa-setting-see-also.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 8.1.09.002
7
  *
8
  */
9
 
@@ -40,132 +40,167 @@ global $wppa_subtab_names;
40
  'custom' => __( 'Custom data', 'wp-photo-album-plus' ),
41
  'constants' => __( 'Constants', 'wp-photo-album-plus' ),
42
  'misc' => __( 'Misc', 'wp-photo-album-plus' ),
43
- 'miscadv' => __( 'Misc', 'wp-photo-album-plus' ),
44
  );
45
  $wppa_subtab_names = array(
46
  'general' => array(
47
- '1' => __('On this tab you can select the features you want to use', 'wp-photo-album-plus' ),
48
  ),
49
  'generaladv' => array(
50
- '1' => __('On this tab you can select the features you want to use', 'wp-photo-album-plus' ),
51
  ),
52
  'layout' => array(
53
- '1' => __('General layout settings', 'wp-photo-album-plus' ),
54
- '2' => __('Breadcrumb specifications', 'wp-photo-album-plus' ),
55
- '3' => __('Navigation symbol specifications', 'wp-photo-album-plus' ),
56
- '4' => __('Multimedia icon and stubfile specifications', 'wp-photo-album-plus' ),
57
- '5' => __('Fonts', 'wp-photo-album-plus' ),
58
  ),
59
  'covers' => array(
60
- '1' => __('Album cover size specifications', 'wp-photo-album-plus' ),
61
- '2' => __('Album cover options', 'wp-photo-album-plus' ),
62
- '3' => __('Album cover layout settings', 'wp-photo-album-plus' ),
63
  ),
64
  'photos' => array(
65
- '1' => __('Photo specifications', 'wp-photo-album-plus' ),
66
- '2' => __('Shortcode [photo ... ] specifications', 'wp-photo-album-plus' ),
67
- '3' => __('Photo of the day settings', 'wp-photo-album-plus' ),
68
  ),
69
  'thumbs' => array(
70
- '1' => __('Thumbnail size specifications', 'wp-photo-album-plus' ),
71
- '2' => __('Thumbnail display options', 'wp-photo-album-plus' ),
72
- '3' => __('Thumbnail layout settings', 'wp-photo-album-plus' ),
73
  ),
74
  'slide' => array(
75
- '1' => __('Sllideshow component specifications', 'wp-photo-album-plus' ),
76
- '2' => __('Slideshow component sequence', 'wp-photo-album-plus' ),
77
- '3' => __('Slideshow layout settings', 'wp-photo-album-plus' ),
78
- '4' => __('Slideshow dynamic behaviour', 'wp-photo-album-plus' ),
79
  ),
80
  'lightbox' => array(
81
- '1' => __('Lightbox overlay configuration settings', 'wp-photo-album-plus' ),
82
  ),
83
  'comments' => array(
84
- '1' => __('Comments system related settings', 'wp-photo-album-plus' ),
85
  ),
86
  'rating' => array(
87
- '1' => __('Rating system related settings', 'wp-photo-album-plus' ),
88
  ),
89
  'search' => array(
90
- '1' => __('Search albums and photos features related settings', 'wp-photo-album-plus' ),
91
  ),
92
  'widget' => array(
93
- '1' => __('General widget size settings', 'wp-photo-album-plus' ),
94
- '2' => __('Visibility settings', 'wp-photo-album-plus' ),
95
- '3' => __('QR Code widget settings', 'wp-photo-album-plus' ),
96
  ),
97
  'links' => array(
98
- '1' => __('System Links configuration', 'wp-photo-album-plus' ),
99
- '2' => __('Links from standard images', 'wp-photo-album-plus' ),
100
- '3' => __('Links from items and images in widgets', 'wp-photo-album-plus' ),
101
- '4' => __('Other links', 'wp-photo-album-plus' ),
102
  ),
103
  'users' => array(
104
- '1' => __('Frontend (user) upload related settings', 'wp-photo-album-plus' ),
105
  ),
106
  'email' => array(
107
- '1' => __('Email configuration settings', 'wp-photo-album-plus' ),
108
- '2' => __('Failed mails', 'wp-photo-album-plus' ),
109
- '3' => __('Permanently failed mails', 'wp-photo-album-plus' ),
110
  ),
111
  'share' => array(
112
- '1' => __('Social media related settings', 'wp-photo-album-plus' ),
113
- '2' => __('Search Engine Optimazation settings', 'wp-photo-album-plus' ),
114
  ),
115
  'system' => array(
116
- '1' => __('System behaviour related settings' , 'wp-photo-album-plus' ),
117
  ),
118
  'files' => array(
119
- '1' => __('Original source file related settings', 'wp-photo-album-plus' ),
120
  ),
121
  'new' => array(
122
- '1' => __('New albums / photos related settings', 'wp-photo-album-plus' ),
123
  ),
124
  'admin' => array(
125
- '1' => __('WPPA+ related roles and capabilities', 'wp-photo-album-plus' ),
126
- '2' => __('Frontend create Albums and upload Photos enabling and limiting settings' , 'wp-photo-album-plus' ),
127
- '3' => __('Import related settings', 'wp-photo-album-plus' ),
128
- '4' => __('Admin Functionality restrictions for non administrators' , 'wp-photo-album-plus' ),
129
- '5' => __('Miscellaneous limiting settings' , 'wp-photo-album-plus' ),
130
- '6' => __('Miscellaneous admin related settings', 'wp-photo-album-plus' ),
131
- '7' => __('Optional menu items', 'wp-photo-album-plus' ),
132
  ),
133
  'maintenance' => array(
134
- '1' => __('Regular maintenance procedures', 'wp-photo-album-plus' ),
135
- '2' => __('Clearing and other irreversable maintenance procedures', 'wp-photo-album-plus' ),
136
- '3' => __('One time conversions', 'wp-photo-album-plus' ),
137
  ),
138
  'exif' => array(
139
- '1' => __('EXIF tags and their labels as found in the uploaded photos', 'wp-photo-album-plus' ),
140
  ),
141
  'iptc' => array(
142
- '1' => __('IPTC tags and their labels as found in the uploaded photos', 'wp-photo-album-plus' ),
143
  ),
144
  'gpx' => array(
145
- '1' => __('GPX configuration', 'wp-photo-album-plus' ),
146
  ),
147
  'custom' => array(
148
  '1' => __( 'Album custom data fields configuration', 'wp-photo-album-plus' ),
149
  '2' => __( 'Photo custom data fields configuration', 'wp-photo-album-plus' ),
150
  ),
151
  'watermark' => array(
152
- '1' => __('Watermark related settings', 'wp-photo-album-plus' ),
153
  ),
154
  'constants' => array(
155
- '1' => __('System constants (read only)', 'wp-photo-album-plus' ),
156
  ),
157
  'misc' => array(
158
- '1' => __('Miscellaneous settings', 'wp-photo-album-plus' ),
159
- '2' => __('Panorama related settings', 'wp-photo-album-plus' ),
160
  ),
161
  'miscadv' => array(
162
- '1' => __('Advanced miscellaneous settings', 'wp-photo-album-plus' ),
163
- '2' => __('Logging', 'wp-photo-album-plus' ),
164
- '3' => __('External services related settings and actions', 'wp-photo-album-plus' ),
165
- '4' => __('Other plugins related settings', 'wp-photo-album-plus' ),
166
  ),
167
  );
168
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
169
  // See also
170
  function wppa_see_also( $tab, $subtab = '', $items = '', $switch = '', $value = '', $error = false ) {
171
  global $wppa_tab_names;
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 8.2.01.004
7
  *
8
  */
9
 
40
  'custom' => __( 'Custom data', 'wp-photo-album-plus' ),
41
  'constants' => __( 'Constants', 'wp-photo-album-plus' ),
42
  'misc' => __( 'Misc', 'wp-photo-album-plus' ),
43
+ 'miscadv' => __( 'Misc', 'wp-photo-album-plus' ),
44
  );
45
  $wppa_subtab_names = array(
46
  'general' => array(
47
+ '1' => __( 'Features', 'wp-photo-album-plus' ),
48
  ),
49
  'generaladv' => array(
50
+ '1' => __( 'Features', 'wp-photo-album-plus' ),
51
  ),
52
  'layout' => array(
53
+ '1' => __( 'General layout settings', 'wp-photo-album-plus' ),
54
+ '2' => __( 'Breadcrumb specifications', 'wp-photo-album-plus' ),
55
+ '3' => __( 'Navigation symbol specifications', 'wp-photo-album-plus' ),
56
+ '4' => __( 'Multimedia icon and stubfile specifications', 'wp-photo-album-plus' ),
57
+ '5' => __( 'Fonts', 'wp-photo-album-plus' ),
58
  ),
59
  'covers' => array(
60
+ '1' => __( 'Album cover size specifications', 'wp-photo-album-plus' ),
61
+ '2' => __( 'Album cover options', 'wp-photo-album-plus' ),
62
+ '3' => __( 'Album cover layout settings', 'wp-photo-album-plus' ),
63
  ),
64
  'photos' => array(
65
+ '1' => __( 'Photo specifications', 'wp-photo-album-plus' ),
66
+ '2' => __( 'Shortcode [photo ... ] specifications', 'wp-photo-album-plus' ),
67
+ '3' => __( 'Photo of the day settings', 'wp-photo-album-plus' ),
68
  ),
69
  'thumbs' => array(
70
+ '1' => __( 'Thumbnail size specifications', 'wp-photo-album-plus' ),
71
+ '2' => __( 'Thumbnail display options', 'wp-photo-album-plus' ),
72
+ '3' => __( 'Thumbnail layout settings', 'wp-photo-album-plus' ),
73
  ),
74
  'slide' => array(
75
+ '1' => __( 'Sllideshow component specifications', 'wp-photo-album-plus' ),
76
+ '2' => __( 'Slideshow component sequence', 'wp-photo-album-plus' ),
77
+ '3' => __( 'Slideshow layout settings', 'wp-photo-album-plus' ),
78
+ '4' => __( 'Slideshow dynamic behaviour', 'wp-photo-album-plus' ),
79
  ),
80
  'lightbox' => array(
81
+ '1' => __( 'Lightbox overlay configuration settings', 'wp-photo-album-plus' ),
82
  ),
83
  'comments' => array(
84
+ '1' => __( 'Comments system related settings', 'wp-photo-album-plus' ),
85
  ),
86
  'rating' => array(
87
+ '1' => __( 'Rating system related settings', 'wp-photo-album-plus' ),
88
  ),
89
  'search' => array(
90
+ '1' => __( 'Search albums and photos features related settings', 'wp-photo-album-plus' ),
91
  ),
92
  'widget' => array(
93
+ '1' => __( 'General widget size settings', 'wp-photo-album-plus' ),
94
+ '2' => __( 'Visibility settings', 'wp-photo-album-plus' ),
95
+ '3' => __( 'QR Code widget settings', 'wp-photo-album-plus' ),
96
  ),
97
  'links' => array(
98
+ '1' => __( 'System Links configuration', 'wp-photo-album-plus' ),
99
+ '2' => __( 'Links from standard images', 'wp-photo-album-plus' ),
100
+ '3' => __( 'Links from items and images in widgets', 'wp-photo-album-plus' ),
101
+ '4' => __( 'Other links', 'wp-photo-album-plus' ),
102
  ),
103
  'users' => array(
104
+ '1' => __( 'Frontend (user) upload related settings', 'wp-photo-album-plus' ),
105
  ),
106
  'email' => array(
107
+ '1' => __( 'Email configuration settings', 'wp-photo-album-plus' ),
108
+ '2' => __( 'Failed mails', 'wp-photo-album-plus' ),
109
+ '3' => __( 'Permanently failed mails', 'wp-photo-album-plus' ),
110
  ),
111
  'share' => array(
112
+ '1' => __( 'Social media related settings', 'wp-photo-album-plus' ),
113
+ '2' => __( 'Search Engine Optimazation settings', 'wp-photo-album-plus' ),
114
  ),
115
  'system' => array(
116
+ '1' => __( 'System behaviour related settings' , 'wp-photo-album-plus' ),
117
  ),
118
  'files' => array(
119
+ '1' => __( 'Original source file related settings', 'wp-photo-album-plus' ),
120
  ),
121
  'new' => array(
122
+ '1' => __( 'New albums / photos related settings', 'wp-photo-album-plus' ),
123
  ),
124
  'admin' => array(
125
+ '1' => __( 'WPPA+ related roles and capabilities', 'wp-photo-album-plus' ),
126
+ '2' => __( 'Frontend create Albums and upload Photos enabling and limiting settings' , 'wp-photo-album-plus' ),
127
+ '3' => __( 'Import related settings', 'wp-photo-album-plus' ),
128
+ '4' => __( 'Admin Functionality restrictions for non administrators' , 'wp-photo-album-plus' ),
129
+ '5' => __( 'Miscellaneous limiting settings' , 'wp-photo-album-plus' ),
130
+ '6' => __( 'Miscellaneous admin related settings', 'wp-photo-album-plus' ),
131
+ '7' => __( 'Optional menu items', 'wp-photo-album-plus' ),
132
  ),
133
  'maintenance' => array(
134
+ '1' => __( 'Regular maintenance procedures', 'wp-photo-album-plus' ),
135
+ '2' => __( 'Clearing and other irreversable maintenance procedures', 'wp-photo-album-plus' ),
136
+ '3' => __( 'One time conversions', 'wp-photo-album-plus' ),
137
  ),
138
  'exif' => array(
139
+ '1' => __( 'EXIF tags and their labels as found in the uploaded photos', 'wp-photo-album-plus' ),
140
  ),
141
  'iptc' => array(
142
+ '1' => __( 'IPTC tags and their labels as found in the uploaded photos', 'wp-photo-album-plus' ),
143
  ),
144
  'gpx' => array(
145
+ '1' => __( 'GPX configuration', 'wp-photo-album-plus' ),
146
  ),
147
  'custom' => array(
148
  '1' => __( 'Album custom data fields configuration', 'wp-photo-album-plus' ),
149
  '2' => __( 'Photo custom data fields configuration', 'wp-photo-album-plus' ),
150
  ),
151
  'watermark' => array(
152
+ '1' => __( 'Watermark related settings', 'wp-photo-album-plus' ),
153
  ),
154
  'constants' => array(
155
+ '1' => __( 'System constants (read only)', 'wp-photo-album-plus' ),
156
  ),
157
  'misc' => array(
158
+ '1' => __( 'Miscellaneous settings', 'wp-photo-album-plus' ),
159
+ '2' => __( 'Panorama related settings', 'wp-photo-album-plus' ),
160
  ),
161
  'miscadv' => array(
162
+ '1' => __( 'Advanced miscellaneous settings', 'wp-photo-album-plus' ),
163
+ '2' => __( 'Logging', 'wp-photo-album-plus' ),
164
+ '3' => __( 'External services related settings and actions', 'wp-photo-album-plus' ),
165
+ '4' => __( 'Other plugins related settings', 'wp-photo-album-plus' ),
166
  ),
167
  );
168
 
169
+ // Setting pathinfo
170
+ function wppa_setting_path( $b_a, $tab, $subtab = '', $item = '', $default = '' ) {
171
+ global $wppa_tab_names;
172
+ global $wppa_subtab_names;
173
+
174
+ $greek = array('0', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X');
175
+
176
+ $result = ( $b_a == 'b' ? __( 'Basic settings', 'wp-photo-album-plus' ) : __( 'Advanced settings', 'wp-photo-album-plus' ) ) . ' -&gt; ';
177
+
178
+ // Subtab given?
179
+ if ( ! $subtab ) {
180
+ $result .= $wppa_tab_names[$tab];
181
+ }
182
+
183
+ // Yes, subtab
184
+ else {
185
+
186
+ // Item given?
187
+ if ( ! $item ) {
188
+ $result .= $wppa_tab_names[$tab] . ' -&gt; ' . $greek[$subtab] . ': ' . $wppa_subtab_names[$tab][$subtab];
189
+ }
190
+
191
+ // Yes
192
+ else {
193
+ $result .= $wppa_tab_names[$tab] . ' -&gt; ' . $greek[$subtab] . ': ' . $wppa_subtab_names[$tab][$subtab] . ' -&gt; ' . __( 'Item', 'wp-photo-album-plus' ) . ': ' . $item;
194
+
195
+ // Default given?
196
+ if ( $default ) {
197
+ $result .= ' (' . $default . ')';
198
+ }
199
+ }
200
+ }
201
+ return $result;
202
+ }
203
+
204
  // See also
205
  function wppa_see_also( $tab, $subtab = '', $items = '', $switch = '', $value = '', $error = false ) {
206
  global $wppa_tab_names;
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 8.2.01.003
7
  *
8
  */
9
 
@@ -6455,68 +6455,6 @@ global $wppa_subtab_names;
6455
  $vals = array('none', 'top', 'bottom', 'both');
6456
  $html = wppa_select($slug, $opts, $vals);
6457
  wppa_setting_new($slug, '10', $name, $desc, $html, $help);
6458
- /*
6459
- $name = __('Defer javascript', 'wp-photo-album-plus' );
6460
- $desc = __('Put javascript near the end of the page.', 'wp-photo-album-plus' );
6461
- $help = (__('If checkd: May fix layout problems and broken slideshows. May speed up or slow down page appearing.', 'wp-photo-album-plus' ));
6462
- $slug = 'wppa_defer_javascript';
6463
- $html = wppa_checkbox($slug);
6464
- wppa_setting_new($slug, '11', $name, $desc, $html, $help);
6465
- */
6466
- global $wppa_setting_error;
6467
- $wppa_setting_error = true;
6468
-
6469
- /*
6470
- $name = __('Custom style', 'wp-photo-album-plus' );
6471
- $desc = __('Enter custom style specs here.', 'wp-photo-album-plus' );
6472
- $help = __('Please move custom css to the wp customizer. WPPA Custom css will be discontinued in a near future revision.', 'wp-photo-album-plus' );
6473
- $slug = 'wppa_custom_style';
6474
- $html = wppa_textarea($slug, $name);
6475
- wppa_setting_new($slug, '13', $name, $desc, $html, $help, wppa_opt( 'custom_style' ) != '' );
6476
-
6477
- $name = __('Custom style Chrome', 'wp-photo-album-plus' );
6478
- $desc = __('Enter browser specific custom style specs here', 'wp-photo-album-plus' );
6479
- // $help = '';
6480
- $slug = 'wppa_custom_style_chrome';
6481
- $html = wppa_textarea($slug, $name);
6482
- wppa_setting_new($slug, '14', $name, $desc, $html, $help, wppa_opt( 'custom_style_chrome' ) != '' );
6483
-
6484
- $name = __('Custom style Firefox', 'wp-photo-album-plus' );
6485
- $desc = __('Enter browser specific custom style specs here', 'wp-photo-album-plus' );
6486
- // $help = '';
6487
- $slug = 'wppa_custom_style_firefox';
6488
- $html = wppa_textarea($slug, $name);
6489
- wppa_setting_new($slug, '15', $name, $desc, $html, $help, wppa_opt( 'custom_style_firefox' ) != '' );
6490
-
6491
- $name = __('Custom style Safari', 'wp-photo-album-plus' );
6492
- $desc = __('Enter browser specific custom style specs here', 'wp-photo-album-plus' );
6493
- // $help = '';
6494
- $slug = 'wppa_custom_style_safari';
6495
- $html = wppa_textarea($slug, $name);
6496
- wppa_setting_new($slug, '16', $name, $desc, $html, $help, wppa_opt( 'custom_style_safari' ) != '' );
6497
-
6498
- $name = __('Custom style Edge', 'wp-photo-album-plus' );
6499
- $desc = __('Enter browser specific custom style specs here', 'wp-photo-album-plus' );
6500
- // $help = '';
6501
- $slug = 'wppa_custom_style_edge';
6502
- $html = wppa_textarea($slug, $name);
6503
- wppa_setting_new($slug, '17', $name, $desc, $html, $help, wppa_opt( 'custom_style_edge' ) != '' );
6504
-
6505
- $name = __('Custom style IE', 'wp-photo-album-plus' );
6506
- $desc = __('Enter browser specific custom style specs here', 'wp-photo-album-plus' );
6507
- // $help = '';
6508
- $slug = 'wppa_custom_style_ie';
6509
- $html = wppa_textarea($slug, $name);
6510
- wppa_setting_new($slug, '18', $name, $desc, $html, $help, wppa_opt( 'custom_style_ie' ) != '' );
6511
-
6512
- $name = __('Custom style Opera', 'wp-photo-album-plus' );
6513
- $desc = __('Enter browser specific custom style specs here', 'wp-photo-album-plus' );
6514
- // $help = '';
6515
- $slug = 'wppa_custom_style_opera';
6516
- $html = wppa_textarea($slug, $name);
6517
- wppa_setting_new($slug, '19', $name, $desc, $html, $help, wppa_opt( 'custom_style_opera' ) != '' );
6518
- */
6519
- $wppa_setting_error = false;
6520
 
6521
  $name = __('Use customized style file', 'wp-photo-album-plus' );
6522
  $desc = __('This feature is highly discouraged.', 'wp-photo-album-plus' );
@@ -6685,8 +6623,9 @@ global $wppa_subtab_names;
6685
  $html = wppa_input($slug, '90%');
6686
  wppa_setting_new($slug, '38', $name, $desc, $html, $help);
6687
 
6688
- $name = __('Gallery not A<b></b>lbum', 'wp-photo-album-plus' );
6689
- $desc = __('Use the name Gallery rather than A<b></b>lbum', 'wp-photo-album-plus' );
 
6690
  $help = '';
6691
  $slug = 'wppa_album_use_gallery';
6692
  $html = wppa_checkbox($slug);
@@ -7030,7 +6969,7 @@ global $wppa_subtab_names;
7030
  $html = wppa_select($slug, $opts, $vals);
7031
  wppa_setting_new($slug, '19', $name, $desc, $html, $help);
7032
 
7033
- $name = __('Grant alnum description', 'wp-photo-album-plus' );
7034
  $desc = __('The description to be used for the album.', 'wp-photo-album-plus' );
7035
  $help = __('You can use "$user" as placeholder for the name; it will be replaced by the name of the album', 'wp-photo-album-plus' );
7036
  $slug = 'wppa_grant_desc';
@@ -9776,10 +9715,13 @@ global $wppa_subtab_names;
9776
  $slug1 = 'wppa_main_photo';
9777
  $slug2 = 'wppa_main_photo_random_once';
9778
  $slug3 = 'wppa_main_photo_reset';
9779
- $html = wppa_select($slug1, $opts, $vals, 'wppaRefreshAfter()') .
 
 
9780
  '<span style="float:left;margin:0 6px">' . __('Fix first found', 'wp-photo-album-plus' ) . '</span>' . wppa_checkbox($slug2) .
9781
  '<span style="float:left;margin:0 6px">' . __('Reset all', 'wp-photo-album-plus' ) . '</span>' . wppa_checkbox($slug3);
9782
- wppa_setting_new($slug, '3', $name, $desc, $html, $help, wppa_opt('main_photo') == '-3' || wppa_opt('main_photo') == '-9');
 
9783
 
9784
  $name = __('Related count', 'wp-photo-album-plus' );
9785
  $desc = __('The default maximum number of related photos to find.', 'wp-photo-album-plus' );
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 8.2.01.004
7
  *
8
  */
9
 
6455
  $vals = array('none', 'top', 'bottom', 'both');
6456
  $html = wppa_select($slug, $opts, $vals);
6457
  wppa_setting_new($slug, '10', $name, $desc, $html, $help);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6458
 
6459
  $name = __('Use customized style file', 'wp-photo-album-plus' );
6460
  $desc = __('This feature is highly discouraged.', 'wp-photo-album-plus' );
6623
  $html = wppa_input($slug, '90%');
6624
  wppa_setting_new($slug, '38', $name, $desc, $html, $help);
6625
 
6626
+ /* translators: don't change &#108; into l, to prevent 'Gallery not Gallery' */
6627
+ $name = __('Gallery not A&#108;bum', 'wp-photo-album-plus' );
6628
+ $desc = __('Use the name Gallery rather than A&#108;bum', 'wp-photo-album-plus' );
6629
  $help = '';
6630
  $slug = 'wppa_album_use_gallery';
6631
  $html = wppa_checkbox($slug);
6969
  $html = wppa_select($slug, $opts, $vals);
6970
  wppa_setting_new($slug, '19', $name, $desc, $html, $help);
6971
 
6972
+ $name = __('Grant album description', 'wp-photo-album-plus' );
6973
  $desc = __('The description to be used for the album.', 'wp-photo-album-plus' );
6974
  $help = __('You can use "$user" as placeholder for the name; it will be replaced by the name of the album', 'wp-photo-album-plus' );
6975
  $slug = 'wppa_grant_desc';
9715
  $slug1 = 'wppa_main_photo';
9716
  $slug2 = 'wppa_main_photo_random_once';
9717
  $slug3 = 'wppa_main_photo_reset';
9718
+ $html = wppa_select($slug1, $opts, $vals, 'wppaRefreshAfter()');
9719
+ if ( wppa_opt('main_photo') == '-3' || wppa_opt('main_photo') == '-9' ) {
9720
+ $html .=
9721
  '<span style="float:left;margin:0 6px">' . __('Fix first found', 'wp-photo-album-plus' ) . '</span>' . wppa_checkbox($slug2) .
9722
  '<span style="float:left;margin:0 6px">' . __('Reset all', 'wp-photo-album-plus' ) . '</span>' . wppa_checkbox($slug3);
9723
+ }
9724
+ wppa_setting_new($slug, '3', $name, $desc, $html, $help);
9725
 
9726
  $name = __('Related count', 'wp-photo-album-plus' );
9727
  $desc = __('The default maximum number of related photos to find.', 'wp-photo-album-plus' );
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.2.01.003
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.2.01.003'; // 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.2.01.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
 
25
  /* WPPA GLOBALS */
26
  global $wppa_api_version;
27
+ $wppa_api_version = '8.2.01.004'; // WPPA software version
28
  global $wppa_revno;
29
  $wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30