Same fixes

Joomla-Ukraine · Feb 7, 2023 · c201920 · c201920
1 parent af85cef
commit c201920
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/.idea/
+/dist/
diff --git a/build.xml b/build.xml
@@ -1,122 +1,150 @@
-<project name="junewsultra" default="dist" basedir=".">
+<project name="junewsultra"
+         default="dist"
+         basedir=".">
 
-    <property name="VERSION" value="7.3"/>
+    <property name="VERSION"
+              value="7.4" />
 
     <tstamp>
-        <format property="DATE" pattern="%d.%m.%Y" />
+        <format property="DATE"
+                pattern="%d.%m.%Y" />
     </tstamp>
 
-    <property name="juimage" value="5.11"/>
+    <property name="juimage"
+              value="5.12" />
 
-    <property name="build" value="build"/>
-    <property name="temp" value="temp"/>
-    <property name="dist" value="dist"/>
+    <property name="build"
+              value="build" />
+    <property name="temp"
+              value="temp" />
+    <property name="dist"
+              value="dist" />
 
-    <property name="filename" value="pkg_junewsultra_pro_v${VERSION}.zip"/>
+    <property name="filename"
+              value="pkg_junewsultra_pro_v${VERSION}.zip" />
 
-    <target name="init" depends="clean">
-        <mkdir dir="${build}"/>
-        <mkdir dir="${temp}"/>
-        <mkdir dir="${dist}"/>
+    <target name="init"
+            depends="clean">
+        <mkdir dir="${build}" />
+        <mkdir dir="${temp}" />
+        <mkdir dir="${dist}" />
     </target>
 
     <target name="temp">
 
         <copy todir="${temp}/language">
             <fileset dir="language">
-                <include name="**"/>
+                <include name="**" />
             </fileset>
         </copy>
 
         <copy todir="${temp}">
             <fileset dir="packages">
-                <include name="**"/>
+                <include name="**" />
             </fileset>
         </copy>
 
     </target>
 
     <target name="replace">
 
-        <copy file="pkg_junewsultra.xml" todir="${build}">
+        <copy file="pkg_junewsultra.xml"
+              todir="${build}">
             <filterchain>
                 <replacetokens>
-                    <token key="version" value="${VERSION}" />
-                    <token key="date" value="${DATE}" />
-                    <token key="juimage" value="${juimage}" />
+                    <token key="version"
+                           value="${VERSION}" />
+                    <token key="date"
+                           value="${DATE}" />
+                    <token key="juimage"
+                           value="${juimage}" />
                 </replacetokens>
             </filterchain>
         </copy>
 
-        <copy file="packages/mod_junewsultra/mod_junewsultra.xml" todir="${temp}/temp/mod_junewsultra">
+        <copy file="packages/mod_junewsultra/mod_junewsultra.xml"
+              todir="${temp}/temp/mod_junewsultra">
             <filterchain>
                 <replacetokens>
-                    <token key="version" value="${VERSION}" />
-                    <token key="date" value="${DATE}" />
+                    <token key="version"
+                           value="${VERSION}" />
+                    <token key="date"
+                           value="${DATE}" />
                 </replacetokens>
             </filterchain>
         </copy>
 
-        <delete file="${temp}/mod_junewsultra/mod_junewsultra.xml"/>
-        <copy file="${temp}/temp/mod_junewsultra/mod_junewsultra.xml" todir="${temp}/mod_junewsultra"/>
+        <delete file="${temp}/mod_junewsultra/mod_junewsultra.xml" />
+        <copy file="${temp}/temp/mod_junewsultra/mod_junewsultra.xml"
+              todir="${temp}/mod_junewsultra" />
 
 
-        <copy file="packages/tmpl_mod_junewsultra_default/default.xml" todir="${temp}/temp/tmpl_mod_junewsultra_default">
+        <copy file="packages/tmpl_mod_junewsultra_default/default.xml"
+              todir="${temp}/temp/tmpl_mod_junewsultra_default">
             <filterchain>
                 <replacetokens>
-                    <token key="version" value="${VERSION}" />
-                    <token key="date" value="${DATE}" />
+                    <token key="version"
+                           value="${VERSION}" />
+                    <token key="date"
+                           value="${DATE}" />
                 </replacetokens>
             </filterchain>
         </copy>
 
-        <delete file="${temp}/tmpl_mod_junewsultra_default/default.xml"/>
-        <copy file="${temp}/temp/tmpl_mod_junewsultra_default/default.xml" todir="${temp}/tmpl_mod_junewsultra_default"/>
+        <delete file="${temp}/tmpl_mod_junewsultra_default/default.xml" />
+        <copy file="${temp}/temp/tmpl_mod_junewsultra_default/default.xml"
+              todir="${temp}/tmpl_mod_junewsultra_default" />
 
     </target>
 
     <target name="pack-plugins">
 
-        <mkdir dir="${build}/packages"/>
+        <mkdir dir="${build}/packages" />
 
-        <zip destfile="${build}/packages/mod_junewsultra.zip" description="mod_junewsultra">
-            <fileset dir="${temp}/mod_junewsultra"/>
+        <zip destfile="${build}/packages/mod_junewsultra.zip"
+             description="mod_junewsultra">
+            <fileset dir="${temp}/mod_junewsultra" />
         </zip>
 
-        <zip destfile="${build}/packages/tmpl_mod_junewsultra_default.zip" description="tmpl_mod_junewsultra_default">
-            <fileset dir="${temp}/tmpl_mod_junewsultra_default"/>
+        <zip destfile="${build}/packages/tmpl_mod_junewsultra_default.zip"
+             description="tmpl_mod_junewsultra_default">
+            <fileset dir="${temp}/tmpl_mod_junewsultra_default" />
         </zip>
 
-        <copy file="../JUImage/dist/pkg_juimage_v${juimage}.zip" todir="${build}/packages"/>
+        <copy file="../JUImage/dist/pkg_juimage_v${juimage}.zip"
+              todir="${build}/packages" />
 
         <copy todir="${build}/language">
             <fileset dir="${temp}/language">
-                <include name="**"/>
+                <include name="**" />
             </fileset>
         </copy>
 
-        <copy file="pkg_junewsultra.xml" todir="${build}"/>
+        <copy file="pkg_junewsultra.xml"
+              todir="${build}" />
 
-        <copy file="script.php" todir="${build}"/>
+        <copy file="script.php"
+              todir="${build}" />
 
     </target>
 
-    <target name="dist" depends="init, temp, replace, pack-plugins">
+    <target name="dist"
+            depends="init, temp, replace, pack-plugins">
         <zip destfile="${dist}/${filename}">
             <fileset dir="${build}/">
-                <include name="**/**"/>
+                <include name="**/**" />
             </fileset>
         </zip>
 
-        <delete dir="${build}"/>
-        <delete dir="${temp}"/>
+        <delete dir="${build}" />
+        <delete dir="${temp}" />
 
     </target>
 
     <target name="clean">
 
-        <delete dir="${build}"/>
-        <delete dir="${temp}"/>
+        <delete dir="${build}" />
+        <delete dir="${temp}" />
 
     </target>
 

diff --git a/packages/mod_junewsultra/Helper.php b/packages/mod_junewsultra/Helper.php
@@ -594,7 +594,7 @@ public function xml($feed_url, $xmlcount, $cache_file, $time, $path, $ordering_x
 			switch($ordering_xml)
 			{
 				case 'rand':
-					$items = $xml->xpath(sprintf($path . '[position()]'));
+					$items = $xml->xpath(sprintf($path . '[position()]', $xmlcount));
 					shuffle($items);
 					$items = array_slice($items, 0, $xmlcount);
 					break;

diff --git a/packages/mod_junewsultra/fields/multicategories.php b/packages/mod_junewsultra/fields/multicategories.php
@@ -73,7 +73,7 @@ protected function getOptions()
 		$tables   = $db->getTableList();
 		$dbprefix = $db->getPrefix();
 
-		if(in_array($dbprefix . $dbtable, $tables))
+		if(in_array($dbprefix . $dbtable, $tables, true))
 		{
 			$db->setQuery($sql);
 			$results = $db->loadObjectList();

diff --git a/packages/mod_junewsultra/fields/uploadimg.php b/packages/mod_junewsultra/fields/uploadimg.php
@@ -93,7 +93,7 @@ function alert($text, $error)
 		$filename = $_FILES[ 'userfile' ][ 'tmp_name' ];
 		$ext      = pathinfo($_FILES[ 'userfile' ][ 'name' ])[ 'extension' ];
 
-		if(!in_array($ext, $valid_types))
+		if(!in_array($ext, $valid_types, true))
 		{
 			$alert = alert(JText::_('MOD_JUNEWS_ERROR2'), 'notice');
 		}