Commit 05be3de1 authored by Nathaniel's avatar Nathaniel
Browse files

Issue #3289079 by Nathaniel: Work on coding standards. Photos rearrange cache context.

parent 664a9eb3

photos.module

+22 −22
Changes for photos.module: 22 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
        $form['photos']['global']['album']['viewpager'] = [

          '#type' => 'number',

          '#title' => t('Images per page'),

          '#default_value' => isset($node->album['viewpager']) ? $node->album['viewpager'] : \Drupal::config('photos.settings')->get('photos_display_viewpager'),

          '#default_value' => $node->album['viewpager'] ?? \Drupal::config('photos.settings')->get('photos_display_viewpager'),

          '#required' => TRUE,

          '#min' => 1,

          '#step' => 1,
@@ -187,7 +187,7 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
          '#type' => 'select',

          '#title' => t('Image display order'),

          '#required' => TRUE,

          '#default_value' => isset($node->album['imageorder']) ? $node->album['imageorder'] : \Drupal::config('photos.settings')->get('photos_display_imageorder'),

          '#default_value' => $node->album['imageorder'] ?? \Drupal::config('photos.settings')->get('photos_display_imageorder'),

          '#options' => PhotosAlbum::orderLabels(),

        ];
@@ -216,11 +216,11 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
        ];

        $form['photos']['global']['album']['viewpager'] = [

          '#type' => 'value',

          '#value' => isset($node->album['viewpager']) ? $node->album['viewpager'] : \Drupal::config('photos.settings')->get('photos_display_viewpager'),

          '#value' => $node->album['viewpager'] ?? \Drupal::config('photos.settings')->get('photos_display_viewpager'),

        ];

        $form['photos']['global']['album']['imageorder'] = [

          '#type' => 'value',

          '#value' => isset($node->album['imageorder']) ? $node->album['imageorder'] : \Drupal::config('photos.settings')->get('photos_display_imageorder'),

          '#value' => $node->album['imageorder'] ?? \Drupal::config('photos.settings')->get('photos_display_imageorder'),

        ];

        $form['photos']['global']['album']['list_imagesize'] = [

          '#type' => 'value',
@@ -242,14 +242,14 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
        ];

        $form['photos']['page']['album']['page_display'] = [

          '#type' => 'radios',

          '#default_value' => isset($node->album['page_display']) ? $node->album['page_display'] : \Drupal::config('photos.settings')->get('photos_display_page_display'),

          '#default_value' => $node->album['page_display'] ?? \Drupal::config('photos.settings')->get('photos_display_page_display'),

          '#title' => t('Display setting'),

          '#required' => TRUE,

          '#options' => $opt,

        ];

        $form['photos']['page']['album']['full_viewnum'] = [

          '#type' => 'number',

          '#default_value' => isset($node->album['full_viewnum']) ? $node->album['full_viewnum'] : \Drupal::config('photos.settings')->get('photos_display_full_viewnum'),

          '#default_value' => $node->album['full_viewnum'] ?? \Drupal::config('photos.settings')->get('photos_display_full_viewnum'),

          '#title' => t('Quantity'),

          '#description' => t('For thumbnails option.'),

          '#required' => TRUE,
@@ -274,11 +274,11 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
        ];

        $form['photos']['page']['album']['page_display'] = [

          '#type' => 'value',

          '#value' => isset($node->album['page_display']) ? $node->album['page_display'] : \Drupal::config('photos.settings')->get('photos_display_page_display'),

          '#value' => $node->album['page_display'] ?? \Drupal::config('photos.settings')->get('photos_display_page_display'),

        ];

        $form['photos']['page']['album']['full_viewnum'] = [

          '#type' => 'value',

          '#value' => isset($node->album['full_viewnum']) ? $node->album['full_viewnum'] : \Drupal::config('photos.settings')->get('photos_display_full_viewnum'),

          '#value' => $node->album['full_viewnum'] ?? \Drupal::config('photos.settings')->get('photos_display_full_viewnum'),

        ];

        $form['photos']['page']['album']['full_imagesize'] = [

          '#type' => 'value',
@@ -296,14 +296,14 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
        ];

        $form['photos']['teaser']['album']['teaser_display'] = [

          '#type' => 'radios',

          '#default_value' => isset($node->album['teaser_display']) ? $node->album['teaser_display'] : \Drupal::config('photos.settings')->get('photos_display_teaser_display'),

          '#default_value' => $node->album['teaser_display'] ?? \Drupal::config('photos.settings')->get('photos_display_teaser_display'),

          '#title' => t('Display setting'),

          '#required' => TRUE,

          '#options' => $opt,

        ];

        $form['photos']['teaser']['album']['teaser_viewnum'] = [

          '#type' => 'number',

          '#default_value' => isset($node->album['teaser_viewnum']) ? $node->album['teaser_viewnum'] : \Drupal::config('photos.settings')->get('photos_display_teaser_viewnum'),

          '#default_value' => $node->album['teaser_viewnum'] ?? \Drupal::config('photos.settings')->get('photos_display_teaser_viewnum'),

          '#title' => t('Quantity'),

          '#description' => t('For thumbnails option.'),

          '#required' => TRUE,
@@ -328,11 +328,11 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
        ];

        $form['photos']['teaser']['album']['teaser_display'] = [

          '#type' => 'value',

          '#value' => isset($node->album['teaser_display']) ? $node->album['teaser_display'] : \Drupal::config('photos.settings')->get('photos_display_teaser_display'),

          '#value' => $node->album['teaser_display'] ?? \Drupal::config('photos.settings')->get('photos_display_teaser_display'),

        ];

        $form['photos']['teaser']['album']['teaser_viewnum'] = [

          '#type' => 'value',

          '#value' => isset($node->album['teaser_viewnum']) ? $node->album['teaser_viewnum'] : \Drupal::config('photos.settings')->get('photos_display_teaser_viewnum'),

          '#value' => $node->album['teaser_viewnum'] ?? \Drupal::config('photos.settings')->get('photos_display_teaser_viewnum'),

        ];

        $form['photos']['teaser']['album']['teaser_imagesize'] = [

          '#type' => 'value',
@@ -348,11 +348,11 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
      ];

      $form['photos']['global']['album']['viewpager'] = [

        '#type' => 'value',

        '#value' => isset($node->album['viewpager']) ? $node->album['viewpager'] : \Drupal::config('photos.settings')->get('photos_display_viewpager'),

        '#value' => $node->album['viewpager'] ?? \Drupal::config('photos.settings')->get('photos_display_viewpager'),

      ];

      $form['photos']['global']['album']['imageorder'] = [

        '#type' => 'value',

        '#value' => isset($node->album['imageorder']) ? $node->album['imageorder'] : \Drupal::config('photos.settings')->get('photos_display_imageorder'),

        '#value' => $node->album['imageorder'] ?? \Drupal::config('photos.settings')->get('photos_display_imageorder'),

      ];

      $form['photos']['global']['album']['list_imagesize'] = [

        '#type' => 'value',
@@ -369,11 +369,11 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
      ];

      $form['photos']['page']['album']['page_display'] = [

        '#type' => 'value',

        '#value' => isset($node->album['page_display']) ? $node->album['page_display'] : \Drupal::config('photos.settings')->get('photos_display_page_display'),

        '#value' => $node->album['page_display'] ?? \Drupal::config('photos.settings')->get('photos_display_page_display'),

      ];

      $form['photos']['page']['album']['full_viewnum'] = [

        '#type' => 'value',

        '#value' => isset($node->album['full_viewnum']) ? $node->album['full_viewnum'] : \Drupal::config('photos.settings')->get('photos_display_full_viewnum'),

        '#value' => $node->album['full_viewnum'] ?? \Drupal::config('photos.settings')->get('photos_display_full_viewnum'),

      ];

      $form['photos']['page']['album']['full_imagesize'] = [

        '#type' => 'value',
@@ -386,11 +386,11 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 
      ];

      $form['photos']['teaser']['album']['teaser_display'] = [

        '#type' => 'value',

        '#value' => isset($node->album['teaser_display']) ? $node->album['teaser_display'] : \Drupal::config('photos.settings')->get('photos_display_teaser_display'),

        '#value' => $node->album['teaser_display'] ?? \Drupal::config('photos.settings')->get('photos_display_teaser_display'),

      ];

      $form['photos']['teaser']['album']['teaser_viewnum'] = [

        '#type' => 'value',

        '#value' => isset($node->album['teaser_viewnum']) ? $node->album['teaser_viewnum'] : \Drupal::config('photos.settings')->get('photos_display_teaser_viewnum'),

        '#value' => $node->album['teaser_viewnum'] ?? \Drupal::config('photos.settings')->get('photos_display_teaser_viewnum'),

      ];

      $form['photos']['teaser']['album']['teaser_imagesize'] = [

        '#type' => 'value',
@@ -400,7 +400,7 @@ function photos_form_node_form_alter(&$form, FormStateInterface $form_state, $fo 


    $form['#validate'][] = 'photos_node_form_validate';



    $album_id = isset($node->album['album_id']) ? $node->album['album_id'] : NULL;

    $album_id = $node->album['album_id'] ?? NULL;

    $form['photos']['page']['album']['album_id'] = [

      '#type' => 'value',

      '#value' => $album_id,
@@ -476,7 +476,7 @@ function photos_node_view(array &$build, EntityInterface $node, EntityViewDispla 
        switch ($view_mode) {

          case 'full':

            $default_display = \Drupal::config('photos.settings')->get('photos_display_page_display');

            $display = isset($node->album['page_display']) ? $node->album['page_display'] : $default_display;

            $display = $node->album['page_display'] ?? $default_display;

            $photos_album = new PhotosAlbum($node->id());

            $album_view = $photos_album->nodeView($node, $display, $view_mode);

            $build['photos_album-' . $display_types[$display]] = $album_view;
@@ -484,7 +484,7 @@ function photos_node_view(array &$build, EntityInterface $node, EntityViewDispla 


          case 'teaser':

            $default_display = \Drupal::config('photos.settings')->get('photos_display_teaser_display');

            $display = isset($node->album['teaser_display']) ? $node->album['teaser_display'] : $default_display;

            $display = $node->album['teaser_display'] ?? $default_display;

            $photos_album = new PhotosAlbum($node->id());

            $album_view = $photos_album->nodeView($node, $display, $view_mode);

            $build['photos_album-' . $display_types[$display]] = $album_view;
@@ -1263,7 +1263,7 @@ function _photos_filter_process($mat) { 
        }

      }

      if ($value) {

        $set_align = isset($set['align']) ? $set['align'] : '';

        $set_align = $set['align'] ?? '';

        $output = isset($align[$set_align]) ? '<div class="' . $align[$set_align] . '">' : '';

        $output .= $value;

        $output .= isset($align[$set_align]) ? '</div>' : '';

photos_access/photos_access.module

+14 −12
Changes for photos_access/photos_access.module: 14 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -62,15 +62,15 @@ function photos_access_form_node_form_alter(&$form, FormStateInterface &$form_st 
      // Access record(s) id.

      $form['photos_privacy']['access_id'] = [

        '#type' => 'value',

        '#value' => isset($node->photos_privacy['access_id']) ? $node->photos_privacy['access_id'] : 0,

        '#value' => $node->photos_privacy['access_id'] ?? 0,

      ];

      $form['photos_privacy']['vid'] = [

        '#type' => 'value',

        '#value' => isset($node->photos_privacy['vid']) ? $node->photos_privacy['vid'] : 0,

        '#value' => $node->photos_privacy['vid'] ?? 0,

      ];

      $form['photos_privacy']['eid'] = [

        '#type' => 'value',

        '#value' => isset($node->photos_privacy['eid']) ? $node->photos_privacy['eid'] : 0,

        '#value' => $node->photos_privacy['eid'] ?? 0,

      ];



      $old = [];
@@ -78,14 +78,16 @@ function photos_access_form_node_form_alter(&$form, FormStateInterface &$form_st 
        // Check collaborators and designated users.

        if (!isset($node->photos_privacy['access_id']) || !$photos_album_access_id = $node->photos_privacy['access_id']) {

          $db = \Drupal::database();

          $photos_album_access_id = $db->query("SELECT id FROM {photos_access_album} WHERE nid = :nid", [':nid' => $nid])->fetchField();

          $photos_album_access_id = $db->query("SELECT id FROM {photos_access_album} WHERE nid = :nid", [

            ':nid' => $nid,

          ])->fetchField();

        }

        if ($photos_album_access_id) {

          $old['updateuser'] = _photos_access_userlist($photos_album_access_id, TRUE);

          $old['viewuser'] = _photos_access_userlist($photos_album_access_id, FALSE);

        }

      }

      $default_viewid = isset($node->photos_privacy['viewid']) ? $node->photos_privacy['viewid'] : 0;

      $default_viewid = $node->photos_privacy['viewid'] ?? 0;

      // @todo add option(s) for external file systems as needed.

      $privacy_options = [

        0 => t('Open'),
@@ -129,7 +131,7 @@ function photos_access_form_node_form_alter(&$form, FormStateInterface &$form_st 
      $form['photos_privacy']['pass'] = [

        '#type' => 'password',

        '#title' => t('Password'),

        '#default_value' => isset($node->photos_privacy['pass']) ? $node->photos_privacy['pass'] : '',

        '#default_value' => $node->photos_privacy['pass'] ?? '',

        '#prefix' => '<div id="photos-access-password"' . $classes . '>',

        '#suffix' => '</div>',

      ];
@@ -154,7 +156,7 @@ function photos_access_form_node_form_alter(&$form, FormStateInterface &$form_st 
        foreach ($old['viewuser'] as $u) {

          $form['photos_privacy']['viewremove'][$u['target_id']] = [

            '#type' => 'checkbox',

            '#default_value' => isset($node->viewremove[$u['target_id']]) ? $node->viewremove[$u['target_id']] : '',

            '#default_value' => $node->viewremove[$u['target_id']] ?? '',

            '#title' => t('Delete: @name', ['@name' => \Drupal::service('renderer')->render($u['username'])]),

            '#prefix' => '<div id="photos-access-remove"' . $classes . '>',

            '#suffix' => '</div>',
@@ -174,7 +176,7 @@ function photos_access_form_node_form_alter(&$form, FormStateInterface &$form_st 
        foreach ($old['updateuser'] as $u) {

          $form['photos_privacy']['updateremove'][$u['target_id']] = [

            '#type' => 'checkbox',

            '#default_value' => isset($node->updateremove[$u['target_id']]) ? $node->updateremove[$u['target_id']] : '',

            '#default_value' => $node->updateremove[$u['target_id']] ?? '',

            '#title' => t('Delete: @name', ['@name' => \Drupal::service('renderer')->render($u['username'])]),

            '#prefix' => '<div id="photos_access_updateremove" class="photos-access-update-remove">',

            '#suffix' => '</div>',
@@ -634,7 +636,7 @@ function photos_access_update_access(NodeInterface $node, array $privacy_setting 
        $acc['viewid'] = $db->insert('photos_access_album')

          ->fields([

            'nid' => $node->id(),

            'viewid' => isset($privacy_settings['viewid']) ? $privacy_settings['viewid'] : 0,

            'viewid' => $privacy_settings['viewid'] ?? 0,

            'pass' => (isset($privacy_settings['pass']) && !empty($privacy_settings['pass'])) ? md5($privacy_settings['pass']) : 0,

          ])

          ->execute();
@@ -905,12 +907,12 @@ function photos_access_node_access_records(NodeInterface $node) { 
  if (\Drupal::config('photos.settings')->get('photos_access_' . $node->getType())) {

    if (isset($node->photos_privacy['vid'])) {

      // @todo cleanup?

      $acc['updateid'] = isset($node->photos_privacy['eid']) ? $node->photos_privacy['eid'] : 0;

      $acc['viewid'] = isset($node->photos_privacy['viewid']) ? $node->photos_privacy['viewid'] : '';

      $acc['updateid'] = $node->photos_privacy['eid'] ?? 0;

      $acc['viewid'] = $node->photos_privacy['viewid'] ?? '';

      $acc['vid'] = $node->photos_privacy['vid'];

    }

    else {

      $acc = isset($_SESSION['photos_access_ac_' . $node->id()]) ? $_SESSION['photos_access_ac_' . $node->id()] : '';

      $acc = $_SESSION['photos_access_ac_' . $node->id()] ?? '';

    }

    if (isset($acc['vid']) || isset($acc['updateid'])) {

      // Author has full access to all albums they create.

src/Controller/PhotosAlbumController.php

+3 −3
Changes for src/Controller/PhotosAlbumController.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -181,9 +181,9 @@ class PhotosAlbumController extends ControllerBase { 
    $node = $this->routeMatch->getParameter('node');

    $nid = $node->id();

    // Get order or set default order.

    $order = explode('|', (isset($node->album['imageorder']) ? $node->album['imageorder'] : $config->get('photos_display_imageorder')));

    $order = explode('|', ($node->album['imageorder'] ?? $config->get('photos_display_imageorder')));

    $order = PhotosAlbum::orderValueChange($order[0], $order[1]);

    $limit = isset($node->album['viewpager']) ? $node->album['viewpager'] : $config->get('photos_display_viewpager');

    $limit = $node->album['viewpager'] ?? $config->get('photos_display_viewpager');

    $get_field = $this->requestStack->getCurrentRequest()->query->get('field');

    $get_sort = $this->requestStack->getCurrentRequest()->query->get('sort');

    $column = $get_field ? Html::escape($get_field) : '';
@@ -211,7 +211,7 @@ class PhotosAlbumController extends ControllerBase { 
    // Check node access.

    $edit = $node->access('update');

    $del = $node->access('delete');

    $style_name = isset($node->album['list_imagesize']) ? $node->album['list_imagesize'] : $config->get('photos_display_list_imagesize');

    $style_name = $node->album['list_imagesize'] ?? $config->get('photos_display_list_imagesize');

    // Necessary when upgrading from D6 to D7.

    // @todo fix in migration if needed?

    $image_styles = image_style_options(FALSE);

src/Controller/PhotosLegacyAlbumViewController.php

+3 −3
Changes for src/Controller/PhotosLegacyAlbumViewController.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ class PhotosLegacyAlbumViewController extends PhotosAlbumController { 
    $node = $this->routeMatch->getParameter('node');

    $nid = $node->id();

    // Get order or set default order.

    $order = explode('|', (isset($node->album['imageorder']) ? $node->album['imageorder'] : $config->get('photos_display_imageorder')));

    $order = explode('|', ($node->album['imageorder'] ?? $config->get('photos_display_imageorder')));

    $order = PhotosAlbum::orderValueChange($order[0], $order[1]);

    $limit = isset($node->album['viewpager']) ? $node->album['viewpager'] : $config->get('photos_display_viewpager');

    $limit = $node->album['viewpager'] ?? $config->get('photos_display_viewpager');

    $get_field = $this->requestStack->getCurrentRequest()->query->get('field');

    $get_sort = $this->requestStack->getCurrentRequest()->query->get('sort');

    $column = $get_field ? Html::escape($get_field) : '';
@@ -56,7 +56,7 @@ class PhotosLegacyAlbumViewController extends PhotosAlbumController { 
    // Check node access.

    $edit = $node->access('update');

    $del = $node->access('delete');

    $style_name = isset($node->album['list_imagesize']) ? $node->album['list_imagesize'] : $config->get('photos_display_list_imagesize');

    $style_name = $node->album['list_imagesize'] ?? $config->get('photos_display_list_imagesize');

    // Necessary when upgrading from D6 to D7.

    $image_styles = image_style_options(FALSE);

    if (!isset($image_styles[$style_name])) {

src/Controller/PhotosLegacyImageViewController.php

+1 −1
Changes for src/Controller/PhotosLegacyImageViewController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ class PhotosLegacyImageViewController extends PhotosImageViewController { 
    $pager_type = 'album_id';

    $pager_id = $image->album_id;

    $data = isset($image->data) ? unserialize($image->data) : [];

    $style_name = isset($data['view_imagesize']) ? $data['view_imagesize'] : $config->get('photos_display_view_imagesize');

    $style_name = $data['view_imagesize'] ?? $config->get('photos_display_view_imagesize');



    $image->links['pager'] = $photosImage->getPager($pager_id, $pager_type);

    $legacyImage = [