Guest User

Drupal 9 Mega Drupal Slider Patch

a guest
Feb 22nd, 2021
552
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 18.51 KB | None | 0 0
  1. diff -ruN md_slider_old/md_slider.info.yml md_slider/md_slider.info.yml
  2. --- md_slider_old/md_slider.info.yml    2018-10-18 20:22:01.000000000 -0700
  3. +++ md_slider/md_slider.info.yml    2021-02-19 10:38:34.250860369 -0800
  4. @@ -6,7 +6,8 @@
  5.    - imce
  6.  
  7.  version: '8.x-1.4'
  8. -core: 8.x
  9. +#core: 8.x
  10. +core_version_requirement: ^8 || ^9
  11.  project: 'md_slider'
  12.  project status url: 'http://megadrupal.com/fserver'
  13. -datestamp: 1539919269
  14. \ No newline at end of file
  15. +datestamp: 1539919269
  16. diff -ruN md_slider_old/md_slider.install md_slider/md_slider.install
  17. --- md_slider_old/md_slider.install 2018-10-18 20:22:01.000000000 -0700
  18. +++ md_slider/md_slider.install 2021-02-16 12:52:47.815292606 -0800
  19. @@ -95,7 +95,7 @@
  20.  
  21.  function md_slider_uninstall() {
  22.    // Remove the css directory
  23. -  file_unmanaged_delete_recursive(file_default_scheme() . '://md-slider-css');
  24. +  file_unmanaged_delete_recursive(\Drupal::config('system.file')->get('default_scheme') . '://md-slider-css');
  25.    // Remove image style md_slider_thumb
  26.    ImageStyle::load('md_slider_thumb')->delete();
  27.  }
  28. \ No newline at end of file
  29. diff -ruN md_slider_old/md_slider.libraries.yml md_slider/md_slider.libraries.yml
  30. --- md_slider_old/md_slider.libraries.yml   2018-10-18 20:22:01.000000000 -0700
  31. +++ md_slider/md_slider.libraries.yml   2021-02-16 17:27:48.873456782 -0800
  32. @@ -42,8 +42,8 @@
  33.      - core/drupal.ajax
  34.      - core/jquery.once
  35.      - core/drupal.dialog
  36. -    - core/jquery.ui.tabs
  37. -    - core/jquery.ui.sortable
  38. +    - jquery_ui_tabs/tabs
  39. +    - jquery_ui_sortable/sortable
  40.      - core/jquery.ui.draggable
  41.      - core/jquery.ui.droppable
  42.  
  43. @@ -56,4 +56,4 @@
  44.    dependencies:
  45.      - core/jquery
  46.      - core/drupal
  47. -    - core/drupalSettings
  48. \ No newline at end of file
  49. +    - core/drupalSettings
  50. diff -ruN md_slider_old/md_slider.module md_slider/md_slider.module
  51. --- md_slider_old/md_slider.module  2018-10-18 20:22:01.000000000 -0700
  52. +++ md_slider/md_slider.module  2021-02-16 12:52:47.844293461 -0800
  53. @@ -157,7 +157,7 @@
  54.    foreach ($slides as $index => $slide) {
  55.      $slide->slideSettings = unserialize($slide->settings);
  56.      $slide->slideSettings += array('slide_id' => $slide->sid);
  57. -    $slide->jsonSlideSettings = JSON::encode($slide->slideSettings);
  58. +    $slide->jsonSlideSettings = Json::encode($slide->slideSettings);
  59.      $slide->contentLayer = array(
  60.        '#theme' => 'admin_layers_render',
  61.        '#layers' => unserialize($slide->layers)
  62. @@ -436,7 +436,7 @@
  63.  
  64.  function template_preprocess_front_layers_render(&$vars) {
  65.    $layer = $vars['layer'];
  66. -  if (!isset($layer{"title"})) {
  67. +  if (!isset($layer["title"])) {
  68.      $layer["title"] = "";
  69.    }
  70.  
  71. @@ -549,4 +549,4 @@
  72.        $libraries['md_slider.slider.' . $slider->machine_name]['css']['component'][$file_url] = array();
  73.      }
  74.    }
  75. -}
  76. \ No newline at end of file
  77. +}
  78. diff -ruN md_slider_old/src/Controller/MDSliderController.php md_slider/src/Controller/MDSliderController.php
  79. --- md_slider_old/src/Controller/MDSliderController.php 2018-10-18 20:22:01.000000000 -0700
  80. +++ md_slider/src/Controller/MDSliderController.php 2021-02-16 12:52:47.877294433 -0800
  81. @@ -20,9 +20,6 @@
  82.  
  83.  class MDSliderController extends ControllerBase {
  84.  
  85. -  /**
  86. -   *
  87. -   */
  88.    public function listMDSlider() {
  89.      $all_slider = MDSliderDataBase::loadAll('md_sliders');
  90.      $header = array(
  91. @@ -61,7 +58,7 @@
  92.        '#theme' => 'table',
  93.        '#header' => $header,
  94.        '#rows' => $rows,
  95. -      '#empty' => t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => \Drupal::url('md_slider.admin.add'))),
  96. +      '#empty' => t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => Url::fromRoute('md_slider.admin.add')->toString())),
  97.        '#attributes' => array('id' => 'md-slider'),
  98.      );
  99.    }
  100. @@ -90,9 +87,9 @@
  101.      $build['slide_settings'] = array(
  102.        '#theme' => 'slide_settings',
  103.      );
  104. -    $json_url = \Drupal::url('md_slider.admin.json_response', array(), array('absolute' => TRUE));
  105. -    $html_url = \Drupal::url('md_slider.admin.html_response', array(), array('absolute' => TRUE));
  106. -    $image_url = \Drupal::url('md_slider.admin.image', array(), array('absolute' => TRUE));
  107. +    $json_url = Url::fromRoute('md_slider.admin.json_response', array(), array('absolute' => TRUE))->toString();
  108. +    $html_url = Url::fromRoute('md_slider.admin.html_response', array(), array('absolute' => TRUE))->toString();
  109. +    $image_url = Url::fromRoute('md_slider.admin.image', array(), array('absolute' => TRUE))->toString();
  110.      $build['#attached']['drupalSettings']['MDSlider']['jsonConfigURL'] = $json_url;
  111.      $build['#attached']['drupalSettings']['MDSlider']['htmlConfigURL'] = $html_url;
  112.      $build['#attached']['drupalSettings']['MDSlider']['imageConfigURL'] = $image_url;
  113. diff -ruN md_slider_old/src/Form/MDSliderCloneForm.php md_slider/src/Form/MDSliderCloneForm.php
  114. --- md_slider_old/src/Form/MDSliderCloneForm.php    2018-10-18 20:22:01.000000000 -0700
  115. +++ md_slider/src/Form/MDSliderCloneForm.php    2021-02-16 12:52:47.889294787 -0800
  116. @@ -136,11 +136,11 @@
  117.            }
  118.          }
  119.          MDSliderRenderCss::saveFileCss($machine_name, $style);
  120. -        drupal_set_message($this->t('Clone successfully Slider %title', array('%title' => $title)));
  121. +        $this->messenger()->addStatus($this->t('Clone successfully Slider %title', array('%title' => $title)));
  122.          $form_state->setRedirect('md_slider.admin.edit', array('slider' => $machine_name));
  123.        }
  124.        else {
  125. -        drupal_set_message($this->t('Clone Failed Slider %title', array('%title' => $title)));
  126. +        $this->messenger()->addStatus($this->t('Clone Failed Slider %title', array('%title' => $title)));
  127.        }
  128.      }
  129.    }
  130. diff -ruN md_slider_old/src/Form/MDSliderConfigForm.php md_slider/src/Form/MDSliderConfigForm.php
  131. --- md_slider_old/src/Form/MDSliderConfigForm.php   2018-10-18 20:22:01.000000000 -0700
  132. +++ md_slider/src/Form/MDSliderConfigForm.php   2021-02-16 12:52:47.902295170 -0800
  133. @@ -7,6 +7,7 @@
  134.  
  135.  namespace Drupal\md_slider\Form;
  136.  
  137. +use Drupal\Core\File\FileSystemInterface;
  138.  use Drupal\Core\Form\FormBase;
  139.  use Drupal\md_slider\MDSlider;
  140.  use Drupal\Core\Form\FormStateInterface;
  141. @@ -361,9 +362,9 @@
  142.        if ($response) {
  143.          $css_content = '';
  144.          $destination_dir = 'public://md-slider-css';
  145. -        file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
  146. -        file_unmanaged_save_data($css_content, $destination_dir . "/md-slider-{$slider->machine_name}-layers.css", FILE_EXISTS_REPLACE);
  147. -        drupal_set_message($this->t('Slider %slider has been created.', array('%slider' => $slider->title)));
  148. +        \Drupal::service('file_system')->prepareDirectory($destination_dir, FileSystemInterface::CREATE_DIRECTORY);
  149. +        \Drupal::service('file_system')->saveData($css_content, $destination_dir . "/md-slider-{$slider->machine_name}-layers.css", FileSystemInterface::EXISTS_REPLACE);
  150. +        $this->messenger()->addStatus($this->t('Slider %slider has been created.', array('%slider' => $slider->title)));
  151.          \Drupal::service('library.discovery')->clearCachedDefinitions();
  152.          $cache = \Drupal::cache('discovery');
  153.          $cache->delete('block_plugins');
  154. @@ -379,7 +380,7 @@
  155.        if ($response) {
  156.          //fix error cache
  157.          \Drupal::service('router.builder')->rebuild();
  158. -        drupal_set_message($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
  159. +        $this->messenger()->addStatus($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
  160.        }
  161.      }
  162.    }
  163. diff -ruN md_slider_old/src/Form/MDSliderDeleteForm.php md_slider/src/Form/MDSliderDeleteForm.php
  164. --- md_slider_old/src/Form/MDSliderDeleteForm.php   2018-10-18 20:22:01.000000000 -0700
  165. +++ md_slider/src/Form/MDSliderDeleteForm.php   2021-02-16 12:52:47.960296880 -0800
  166. @@ -97,7 +97,7 @@
  167.        $this->md_slider->getDataSlider($this->md_slider->machine_name);
  168.        $response = $this->md_slider->deleteDataSlider($this->md_slider->slid);
  169.        if ($response)
  170. -        drupal_set_message($this->t('Slider %slider has been deleted.', array('%slider' => $this->md_slider->title)));
  171. +        $this->messenger()->addStatus($this->t('Slider %slider has been deleted.', array('%slider' => $this->md_slider->title)));
  172.        $form_state->setRedirect('md_slider.admin');
  173.      }
  174.    }
  175. diff -ruN md_slider_old/src/Form/MDSliderEditForm.php md_slider/src/Form/MDSliderEditForm.php
  176. --- md_slider_old/src/Form/MDSliderEditForm.php 2018-10-18 20:22:01.000000000 -0700
  177. +++ md_slider/src/Form/MDSliderEditForm.php 2021-02-16 12:52:47.965297028 -0800
  178. @@ -111,6 +111,6 @@
  179.      $file = MDSliderRenderCss::saveFileCss($slider->machine_name, $style);
  180.      //fix error cache
  181.      \Drupal::service('router.builder')->rebuild();
  182. -    drupal_set_message($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
  183. +    $this->messenger()->addStatus($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
  184.    }
  185.  }
  186. \ No newline at end of file
  187. diff -ruN md_slider_old/src/Form/MDSliderImageForm.php md_slider/src/Form/MDSliderImageForm.php
  188. --- md_slider_old/src/Form/MDSliderImageForm.php    2018-10-18 20:22:01.000000000 -0700
  189. +++ md_slider/src/Form/MDSliderImageForm.php    2021-02-19 11:16:38.614901962 -0800
  190. @@ -43,7 +43,7 @@
  191.     */
  192.    public static function create(ContainerInterface $container) {
  193.      return new static(
  194. -      $container->get('entity.manager')->getStorage('file')
  195. +      $container->get('entity_type.manager')->getStorage('file')
  196.      );
  197.    }
  198.  
  199. diff -ruN md_slider_old/src/Form/MDSliderImportForm.php md_slider/src/Form/MDSliderImportForm.php
  200. --- md_slider_old/src/Form/MDSliderImportForm.php   2018-10-18 20:22:01.000000000 -0700
  201. +++ md_slider/src/Form/MDSliderImportForm.php   2021-02-19 11:16:49.098159160 -0800
  202. @@ -7,6 +7,7 @@
  203.  
  204.  namespace Drupal\md_slider\Form;
  205.  
  206. +use Drupal\Core\File\FileSystemInterface;
  207.  use Drupal\Core\Entity\EntityStorageInterface;
  208.  use Drupal\Core\Form\FormBase;
  209.  use Drupal\Core\Form\FormStateInterface;
  210. @@ -40,7 +41,7 @@
  211.     */
  212.    public static function create(ContainerInterface $container) {
  213.      return new static(
  214. -      $container->get('entity.manager')->getStorage('file')
  215. +      $container->get('entity_type.manager')->getStorage('file')
  216.      );
  217.    }
  218.  
  219. @@ -80,9 +81,9 @@
  220.     */
  221.    public function validateForm(array &$form, FormStateInterface $form_state) {
  222.      $destination_dir = 'public://md-slider-image';
  223. -    $writable = file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
  224. +    $writable = \Drupal::service('file_system')->prepareDirectory($destination_dir, FileSystemInterface::CREATE_DIRECTORY);
  225.      if (!$writable) {
  226. -      drupal_set_message($this->t());
  227. +      $this->messenger()->addStatus($this->t());
  228.        $form_state->setError($form, t('The directory %dir does not exist and could not be created.', array('%dir' =>  $destination_dir)));
  229.      }
  230.    }
  231. @@ -94,11 +95,11 @@
  232.  
  233.      $fid = $form_state->getValue('file');
  234.      $file = File::load($fid[0]);
  235. -    $file_path = drupal_realpath($file->getFileUri());
  236. +    $file_path = \Drupal::service('file_system')->realpath($file->getFileUri());
  237.      $destination_dir = 'public://md-slider-image';
  238.      $import = new MDSliderImport();
  239.      $import->getDataImport($file_path, $destination_dir);
  240.      $import->importDataSlider();
  241. -    drupal_set_message($this->t("MD Slider: Import successful!"));
  242. +    $this->messenger()->addStatus($this->t("MD Slider: Import successful!"));
  243.    }
  244. -}
  245. \ No newline at end of file
  246. +}
  247. diff -ruN md_slider_old/src/MDSliderDataBase.php md_slider/src/MDSliderDataBase.php
  248. --- md_slider_old/src/MDSliderDataBase.php  2018-10-18 20:22:01.000000000 -0700
  249. +++ md_slider/src/MDSliderDataBase.php  2021-02-16 12:52:48.015298502 -0800
  250. @@ -17,22 +17,26 @@
  251.    public static function insert($table, $field) {
  252.      $return_value = NULL;
  253.      try {
  254. -      $return_value = db_insert($table)
  255. +      // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
  256. +      // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
  257. +      $return_value = \Drupal::database()->insert($table)
  258.          ->fields($field)
  259.          ->execute();
  260.      }
  261.      catch (\Exception $e) {
  262. -      drupal_set_message(t('db_insert failed. Message = %message, query= %query', array(
  263. +      \Drupal::messenger()->addError(t('db_insert failed. Message = %message, query= %query', array(
  264.          '%message' => $e->getMessage(),
  265.          '%query' => $e->query_string,
  266. -      )), 'error');
  267. +      )));
  268.      }
  269.      return $return_value;
  270.    }
  271.  
  272.    public static function update($table, $fields, $conditions) {
  273.      try {
  274. -      $count = db_update($table)
  275. +      // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
  276. +      // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
  277. +      $count = \Drupal::database()->update($table)
  278.          ->fields($fields);
  279.        foreach ($conditions as $field => $value) {
  280.          $count->condition($field, $value);
  281. @@ -40,10 +44,10 @@
  282.        $count->execute();
  283.      }
  284.      catch (\Exception $e) {
  285. -      drupal_set_message(t('db_update failed. Message = %message, query= %query', array(
  286. +      \Drupal::messenger()->addError(t('db_update failed. Message = %message, query= %query', array(
  287.          '%message' => $e->getMessage(),
  288.          '%query' => $e->query_string,
  289. -      )), 'error');
  290. +      )));
  291.      }
  292.      return $count;
  293.    }
  294. @@ -52,7 +56,9 @@
  295.     * @param array $entry
  296.     */
  297.    public static function load($table, $entry = array()) {
  298. -    $select = db_select($table, 'table_alias');
  299. +    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
  300. +    // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
  301. +    $select = \Drupal::database()->select($table, 'table_alias');
  302.      $select->fields('table_alias');
  303.      foreach ($entry as $field => $value) {
  304.        $select->condition($field, $value);
  305. @@ -67,7 +73,9 @@
  306.     * @return
  307.     */
  308.    public static function loadAll($table, $entry = array(), $sort = array()) {
  309. -    $select = db_select($table, 'table_alias');
  310. +    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
  311. +    // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
  312. +    $select = \Drupal::database()->select($table, 'table_alias');
  313.      $select->fields('table_alias');
  314.      if (count($entry) > 0) {
  315.        foreach ($entry as $field => $value) {
  316. @@ -84,7 +92,9 @@
  317.    }
  318.  
  319.    public static function delete($table, $entry = array()) {
  320. -    $delete = db_delete($table);
  321. +    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
  322. +    // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
  323. +    $delete = \Drupal::database()->delete($table);
  324.      if (count($entry) > 0) {
  325.        foreach ($entry as $field => $value) {
  326.          $delete->condition($field, $value);
  327. diff -ruN md_slider_old/src/Plugin/Field/FieldWidget/MDSliderWidget.php md_slider/src/Plugin/Field/FieldWidget/MDSliderWidget.php
  328. --- md_slider_old/src/Plugin/Field/FieldWidget/MDSliderWidget.php   2018-10-18 20:22:01.000000000 -0700
  329. +++ md_slider/src/Plugin/Field/FieldWidget/MDSliderWidget.php   2021-02-16 12:52:48.037299150 -0800
  330. @@ -7,6 +7,7 @@
  331.  
  332.  namespace Drupal\md_slider\Plugin\Field\FieldWidget;
  333.  
  334. +use Drupal\Core\Url;
  335.  use Drupal\Core\Field\FieldItemListInterface;
  336.  use Drupal\Core\Field\WidgetBase;
  337.  use Drupal\Core\Form\FormStateInterface;
  338. @@ -35,7 +36,7 @@
  339.      if (count($all_slider) == 0) {
  340.        $element += [
  341.          '#type' => 'markup',
  342. -        '#markup' => '<h5>'. t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => \Drupal::url('md_slider.admin.add'))) . '</h5>'
  343. +        '#markup' => '<h5>'. t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => Url::fromRoute('md_slider.admin.add')->toString())) . '</h5>'
  344.        ];
  345.      }
  346.      else {
  347. diff -ruN md_slider_old/src/Slider/MDSliderImport.php md_slider/src/Slider/MDSliderImport.php
  348. --- md_slider_old/src/Slider/MDSliderImport.php 2018-10-18 20:22:01.000000000 -0700
  349. +++ md_slider/src/Slider/MDSliderImport.php 2021-02-16 12:52:48.047299445 -0800
  350. @@ -7,6 +7,7 @@
  351.  
  352.  namespace Drupal\md_slider\Slider;
  353.  
  354. +use Drupal\Core\File\FileSystemInterface;
  355.  use Drupal\md_slider\MDSlide;
  356.  use Drupal\md_slider\MDSlider;
  357.  
  358. @@ -44,7 +45,7 @@
  359.          // Get image content
  360.          zip_entry_open($zip, $entry);
  361.          $entry_content = zip_entry_read($entry, zip_entry_filesize($entry));
  362. -        $image = file_save_data($entry_content, "{$destination_dir}/{$image_name}", FILE_EXISTS_RENAME);
  363. +        $image = file_save_data($entry_content, "{$destination_dir}/{$image_name}", FileSystemInterface::EXISTS_RENAME);
  364.          if ($image !== FALSE)
  365.            $images[$image_name] = $image;
  366.          zip_entry_close($entry);
  367. @@ -91,7 +92,7 @@
  368.        $slid = $md_slider->saveDataSlider();
  369.        $style = array();
  370.        if (!$slid) {
  371. -        drupal_set_message(t("MD Slider: Import unsuccessful!"), "error");
  372. +        \Drupal::messenger()->addError(t("MD Slider: Import unsuccessful!"));
  373.          return;
  374.        }
  375.  
  376. diff -ruN md_slider_old/src/Slider/MDSliderRenderCss.php md_slider/src/Slider/MDSliderRenderCss.php
  377. --- md_slider_old/src/Slider/MDSliderRenderCss.php  2018-10-18 20:22:01.000000000 -0700
  378. +++ md_slider/src/Slider/MDSliderRenderCss.php  2021-02-16 12:52:48.059299799 -0800
  379. @@ -6,6 +6,7 @@
  380.  
  381.  namespace Drupal\md_slider\Slider;
  382.  
  383. +use Drupal\Core\File\FileSystemInterface;
  384.  class MDSliderRenderCss{
  385.  
  386.    /**
  387. @@ -262,8 +263,8 @@
  388.    public static function saveFileCss($slider_name, $style) {
  389.      $css = implode("\r\n", $style);
  390.      $destination_dir = 'public://md-slider-css';
  391. -    file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
  392. -    file_unmanaged_save_data($css, $destination_dir . "/md-slider-{$slider_name}-layers.css", FILE_EXISTS_REPLACE);
  393. +    \Drupal::service('file_system')->prepareDirectory($destination_dir, FileSystemInterface::CREATE_DIRECTORY);
  394. +    \Drupal::service('file_system')->saveData($css, $destination_dir . "/md-slider-{$slider_name}-layers.css", FileSystemInterface::EXISTS_REPLACE);
  395.    }
  396.  }
  397.  
  398.  
Advertisement
Add Comment
Please, Sign In to add comment