Prepare for 3.3.5 release

Co-Authored-By: Alwin <team@joomgalleryfriends.net>
JoomGalleryfriends · Apr 21, 2019 · bda9d63 · bda9d63
1 parent b636939
commit bda9d63
Show file tree

Hide file tree

Showing 33 changed files with 139 additions and 88 deletions.
diff --git a/administrator/components/com_joomgallery/changelog.xml b/administrator/components/com_joomgallery/changelog.xml
@@ -1,5 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+  <release version="3.3.5" published="20190405">
+    <entries date="20190325">
+      <logentry type="^">change update server to new website</logentry>
+    </entries>
+    <entries date="20190220">
+      <logentry type="#">Fix form field joomordering PR#173</logentry>
+    </entries>
+    <entries date="20181124">
+      <logentry type="^">Chosen select for ajaxupload PR#170</logentry>
+    </entries>
+    <entries date="20180904">
+      <logentry type="#">Fix saving images in back end image manager PR#167</logentry>
+    </entries>
+    <entries date="20180716">
+      <logentry type="#">Fix count warning PR#160</logentry>
+    </entries>
+    <entries date="20180428">
+      <logentry type="#">Fix typo</logentry>
+    </entries>
+    <entries date="20180227">
+      <logentry type="#">Fix rowcount for class jg row</logentry>
+    </entries>
+    <entries date="20180224">
+      <logentry type="#">Fix of replacing image files in back end image view</logentry>
+    </entries>
+    <entries date="20180218">
+      <logentry type="#">Fix deleting of categories containing images in maintenance manager</logentry>
+    </entries>
+    <entries date="20180128">
+      <logentry type="#">Fix creating a new configuration in extented configuration manager</logentry>
+    </entries>
+  </release>
   <release version="3.3.4" published="20180121">
     <entries date="20180121">
       <logentry type="#">Adding a modal header and footer to image selection field popup</logentry>

diff --git a/administrator/components/com_joomgallery/helpers/extensions.php b/administrator/components/com_joomgallery/helpers/extensions.php
@@ -47,8 +47,8 @@ public static function getAvailableExtensions()
       $subdomain = 'en.';
     }
 
-    $site   = 'http://www.'.$subdomain.'joomgallery.net';
-    $site2  = 'http://'.$subdomain.'joomgallery.net';
+    $site   = 'https://www.'.$subdomain.'joomgalleryfriends.net';
+    $site2  = 'https://'.$subdomain.'joomgalleryfriends.net';
     $rssurl = $site.'/components/com_newversion/rss/extensions3.rss';
 
     // Get RSS parsed object

diff --git a/administrator/components/com_joomgallery/helpers/html/joomgallery.php b/administrator/components/com_joomgallery/helpers/html/joomgallery.php
@@ -1127,12 +1127,12 @@ public static function credits()
 <div class="center">
   <p>
     <br />
-    <a href="http://www.joomgallery.net" target="_blank">
+    <a href="https://www.joomgalleryfriends.net" target="_blank">
       <img src="<?php echo $ambit->getIcon('powered_by.gif'); ?>"  class="jg-poweredby" alt="Powered by JoomGallery" />
     </a>
   </p>
   By:
-  <a href="mailto:team@joomgallery.net">
+  <a href="mailto:team@joomgalleryfriends.net">
     JoomGallery::ProjectTeam
   </a>
   <br />

diff --git a/administrator/components/com_joomgallery/joomgallery.xml b/administrator/components/com_joomgallery/joomgallery.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.0" method="upgrade">
   <name>JoomGallery</name>
-  <creationDate>2018/01/21</creationDate>
+  <creationDate>2019/04/05</creationDate>
   <author>JoomGallery::ProjectTeam</author>
   <copyright>This component is released under the GNU/GPL License</copyright>
-  <authorEmail>team@joomgallery.net</authorEmail>
-  <authorUrl>http://www.joomgallery.net</authorUrl>
-  <version>3.3.4</version>
+  <authorEmail>team@joomgalleryfriends.net</authorEmail>
+  <authorUrl>https://www.joomgalleryfriends.net</authorUrl>
+  <version>3.3.5</version>
   <description>JoomGallery 3 is a native Joomla! 3.x gallery component</description>
   <files folder="components/com_joomgallery">
     <folder>controllers</folder>
@@ -92,6 +92,6 @@
     </languages>
   </administration>
   <updateservers>
-    <server type="collection" priority="1" name="JoomGallery Update Service">http://www.en.joomgallery.net/components/com_newversion/xml/extensions3.xml</server>
+    <server type="collection" priority="1" name="JoomGallery Update Service">https://www.joomgalleryfriends.net/components/com_newversion/xml/extensions3.xml</server>
   </updateservers>
 </extension>
diff --git a/administrator/components/com_joomgallery/models/fields/joomcategory.php b/administrator/components/com_joomgallery/models/fields/joomcategory.php
@@ -52,7 +52,7 @@ protected function getInput()
       {
         $class .= ' ';
       }
-      $class .= 'required';
+      $class .= 'required chzn-done';
     }
     if($this->element['validate'] && (string) $this->element['validate'] == 'joompositivenumeric')
     {

diff --git a/administrator/components/com_joomgallery/models/fields/joomordering.php b/administrator/components/com_joomgallery/models/fields/joomordering.php
@@ -96,7 +96,7 @@ protected function getInput()
       var originalOrder   = '.$originalOrder.';
       var originalParent  = '.$originalParent.';
       var orders          = new Array();'.$script.'
-      writeDynaList( \'class="inputbox" name="'.$this->name.'" id="'.$this->id.'"'.$disabled.' size="1"\', orders, originalParent, originalParent, originalOrder );
+      writeDynaList( \'class="inputbox" name="'.$this->name.'" id="'.$this->id.'"'.$disabled.' size="1"\', orders, originalParent, originalParent, originalOrder, document.currentScript.parentNode);
       jQuery(document).ready(function() {
         document.getElementById(\''.$parent_id.'\').addEvent(\'change\', function() {
           var catid = document.getElementById(\''.$parent_id.'\').value;

diff --git a/administrator/components/com_joomgallery/models/forms/image.xml b/administrator/components/com_joomgallery/models/forms/image.xml
@@ -17,7 +17,6 @@
       label="COM_JOOMGALLERY_IMGMAN_IMAGE_ID"
       size="20"
       readonly="true"
-      disabled="true"
     />
     <field
       name="asset_id"

diff --git a/administrator/components/com_joomgallery/script.php b/administrator/components/com_joomgallery/script.php
@@ -28,7 +28,7 @@ class Com_JoomGalleryInstallerScript
    *
    * @var string
    */
-  private $version = '3.3.4';
+  private $version = '3.3.5';
 
   /**
    * Preflight method
@@ -102,7 +102,7 @@ public function install()
     $row->params    = 'cache=1
     cache_time=15
     moduleclass_sfx=
-    rssurl=http://www.'.$subdomain.'joomgallery.net/feed/rss.html
+    rssurl=https://www.'.$subdomain.'joomgalleryfriends.net/?format=feed&amp;type=rss
     rssrtl=0
     rsstitle=1
     rssdesc=0
@@ -245,11 +245,16 @@ public function update()
     // Files
     $delete_files = array();
 
-    // Cache file of the newsfeed for the update checker
+    // Cache file of the newsfeed for the update checker JoomGallery < 3.3.5
     $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('http://www.joomgallery.net/components/com_newversion/rss/extensions2.rss').'.spc';
     $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('http://www.en.joomgallery.net/components/com_newversion/rss/extensions2.rss').'.spc';
     $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('http://www.joomgallery.net/components/com_newversion/rss/extensions3.rss').'.spc';
     $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('http://www.en.joomgallery.net/components/com_newversion/rss/extensions3.rss').'.spc';
+    // Cache file of the newsfeed for the update checker JoomGallery >= 3.3.5
+    $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('https://www.joomgalleryfriends.net/components/com_newversion/rss/extensions2.rss').'.spc';
+    $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('https://www.en.joomgalleryfriends.net/components/com_newversion/rss/extensions2.rss').'.spc';
+    $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('https://www.joomgalleryfriends.net/components/com_newversion/rss/extensions3.rss').'.spc';
+    $delete_files[] = JPATH_ADMINISTRATOR.'/cache/'.md5('https://www.en.joomgalleryfriends.net/components/com_newversion/rss/extensions3.rss').'.spc';
 
     // Zip file of latest auto update with cURL
     $delete_files[] = JPATH_ADMINISTRATOR.'/components/com_joomgallery/temp/update.zip';

diff --git a/administrator/components/com_joomgallery/sql/updates/mysql/3.3.5.sql b/administrator/components/com_joomgallery/sql/updates/mysql/3.3.5.sql
@@ -0,0 +1,9 @@
+UPDATE `#__updates` SET `detailsurl` = replace(`detailsurl`, 'http://www.en.joomgallery.net/','https://www.joomgalleryfriends.net/') where `detailsurl` like '%www.en.joomgallery.net/%';
+UPDATE `#__updates` SET `detailsurl` = replace(`detailsurl`, 'http://www.joomgallery.net/','https://www.joomgalleryfriends.net/') where `detailsurl` like '%www.joomgallery.net/%';
+
+UPDATE `#__update_sites` SET `location` = replace(`location`, 'http://www.en.joomgallery.net/','https://www.joomgalleryfriends.net/') where `location` like '%www.en.joomgallery.net/%';
+UPDATE `#__update_sites` SET `location` = replace(`location`, 'http://www.joomgallery.net/','https://www.joomgalleryfriends.net/') where `location` like '%www.joomgallery.net/%';
+
+UPDATE `#__modules` SET `params` = '{"rssurl":"https:\/\/www.joomgalleryfriends.net\/?format=feed&amp;type=rss","rssrtl":0,"rsstitle":1,"rssdate":"0","rssdesc":0,"rssimage":1,"rssitems":3,"rssitemdesc":1,"rssitemdate":0,"word_count":200,"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}' where `params` like '%www.joomgallery.net%';
+UPDATE `#__modules` SET `params` = '{"rssurl":"https:\/\/www.en.joomgalleryfriends.net\/?format=feed&amp;type=rss","rssrtl":0,"rsstitle":1,"rssdate":"0","rssdesc":0,"rssimage":1,"rssitems":3,"rssitemdesc":1,"rssitemdate":0,"word_count":200,"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}' where `params` like '%www.en.joomgallery.net%';
+
diff --git a/administrator/components/com_joomgallery/views/ajaxupload/tmpl/default.php b/administrator/components/com_joomgallery/views/ajaxupload/tmpl/default.php
@@ -1,6 +1,7 @@
 <?php defined('_JEXEC') or die('Direct Access to this location is not allowed.');
 JHtml::_('behavior.formvalidation');
-JHtml::_('bootstrap.tooltip'); ?>
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select'); ?>
 <?php if(!empty($this->sidebar)): ?>
 <div id="j-sidebar-container" class="span2">
   <?php echo $this->sidebar; ?>

diff --git a/administrator/components/com_joomgallery/views/help/tmpl/default.php b/administrator/components/com_joomgallery/views/help/tmpl/default.php
@@ -18,7 +18,7 @@
               <img src="<?php echo $this->_ambit->getIcon('flags/de.png'); ?>" border="0" align="top" width="16" height="11" alt="german" />&nbsp;
             </td>
             <td>
-              <a href='http://www.joomgallery.net/' target='_blank'>http://www.joomgallery.net</a>
+              <a href='https://www.joomgalleryfriends.net/' target='_blank'>https://www.joomgalleryfriends.net/</a>
             </td>
           </tr>
           <tr>
@@ -27,7 +27,7 @@
               <img src="<?php echo $this->_ambit->getIcon('flags/gb.png'); ?>" border="0" align="top" width="16" height="11" alt="english" />&nbsp;
             </td>
             <td >
-              <a href='http://www.en.joomgallery.net/' target='_blank'>http://www.en.joomgallery.net/</a>
+              <a href='https://www.en.joomgalleryfriends.net/' target='_blank'>https://www.en.joomgalleryfriends.net/</a>
             </td>
           </tr>
           <tr>
@@ -36,7 +36,7 @@
               <img src="<?php echo $this->_ambit->getIcon('flags/de.png'); ?>" border="0" align="top" width="16" height="11" alt="german" />&nbsp;
             </td>
             <td>
-              <a href='http://www.forum.joomgallery.net/' target='_blank'>http://www.forum.joomgallery.net/</a>
+              <a href='https://www.forum.joomgalleryfriends.net/' target='_blank'>https://www.forum.joomgalleryfriends.net/</a>
             </td>
           </tr>
           <tr>
@@ -45,7 +45,7 @@
               <img src="<?php echo $this->_ambit->getIcon('flags/gb.png'); ?>" border="0" align="top" width="16" height="11" alt="english" />&nbsp;
             </td>
             <td>
-              <a href='http://www.forum.en.joomgallery.net/' target='_blank'>http://www.forum.en.joomgallery.net/</a>
+              <a href='https://www.forum.en.joomgalleryfriends.net/' target='_blank'>https://www.forum.en.joomgalleryfriends.net/</a>
             </td>
           </tr>
           <tr>
@@ -65,10 +65,10 @@
       <div class="well well-small">
         <div class="module-title nav-header"><?php echo JText::_('COM_JOOMGALLERY_HLPIFO_TEAM'); ?></div>
         <div class="text-center">
-          <p><?php echo JText::sprintf('COM_JOOMGALLERY_HLPIFO_TEAM_TEXT', '<a href="http://en.joomgallery.net/team.html" target="_blank">JoomGallery::ProjectTeam</a>', '<a href="https://github.com/JoomGallery" target="_blank">GitHub</a>'); ?></p>
+          <p><?php echo JText::sprintf('COM_JOOMGALLERY_HLPIFO_TEAM_TEXT', '<a href="https://en.joomgalleryfriends.net/team.html" target="_blank">JoomGallery::ProjectTeam</a>', '<a href="https://github.com/JoomGalleryfriends" target="_blank">GitHub</a>'); ?></p>
           <p><?php echo JText::_('COM_JOOMGALLERY_HLPIFO_TEAM_CONTRIBUTORS'); ?></p>
           <p><small class="muted"><?php echo JText::_('COM_JOOMGALLERY_HLPIFO_TEAM_CONTRIBUTORS_HINT'); ?></small></p>
-          <a href="https://github.com/JoomGallery" target="_blank"><img width="200" src="<?php echo $this->_ambit->getIcon('others/GitHub_Logo.png'); ?>" alt="GitHub Logo"></a></div>
+          <a href="https://github.com/JoomGalleryfriends" target="_blank"><img width="200" src="<?php echo $this->_ambit->getIcon('others/GitHub_Logo.png'); ?>" alt="GitHub Logo"></a></div>
       </div>
     </div>
   </div>
@@ -124,7 +124,7 @@
         </div>
         <div class="center">
           <?php echo JText::_('COM_JOOMGALLERY_HLPIFO_SPONSORS'); ?>
-          <a href="mailto:joom@joomgallery.net">joom@joomgallery.net</a>
+          <a href="mailto:team@joomgalleryfriends.net">team@joomgalleryfriends.net</a>
         </div>
       </div>
     </div>