Skip to content

Commit c201920

Browse files
denysdesigndenysdesign
committed
Same fixes
1 parent af85cef commit c201920

File tree

5 files changed

+76
-46
lines changed

5 files changed

+76
-46
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.idea/
2+
/dist/

‎build.xml‎

Lines changed: 71 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,150 @@
1-
<project name="junewsultra" default="dist" basedir=".">
1+
<project name="junewsultra"
2+
default="dist"
3+
basedir=".">
24

3-
<property name="VERSION" value="7.3"/>
5+
<property name="VERSION"
6+
value="7.4" />
47

58
<tstamp>
6-
<format property="DATE" pattern="%d.%m.%Y" />
9+
<format property="DATE"
10+
pattern="%d.%m.%Y" />
711
</tstamp>
812

9-
<property name="juimage" value="5.11"/>
13+
<property name="juimage"
14+
value="5.12" />
1015

11-
<property name="build" value="build"/>
12-
<property name="temp" value="temp"/>
13-
<property name="dist" value="dist"/>
16+
<property name="build"
17+
value="build" />
18+
<property name="temp"
19+
value="temp" />
20+
<property name="dist"
21+
value="dist" />
1422

15-
<property name="filename" value="pkg_junewsultra_pro_v${VERSION}.zip"/>
23+
<property name="filename"
24+
value="pkg_junewsultra_pro_v${VERSION}.zip" />
1625

17-
<target name="init" depends="clean">
18-
<mkdir dir="${build}"/>
19-
<mkdir dir="${temp}"/>
20-
<mkdir dir="${dist}"/>
26+
<target name="init"
27+
depends="clean">
28+
<mkdir dir="${build}" />
29+
<mkdir dir="${temp}" />
30+
<mkdir dir="${dist}" />
2131
</target>
2232

2333
<target name="temp">
2434

2535
<copy todir="${temp}/language">
2636
<fileset dir="language">
27-
<include name="**"/>
37+
<include name="**" />
2838
</fileset>
2939
</copy>
3040

3141
<copy todir="${temp}">
3242
<fileset dir="packages">
33-
<include name="**"/>
43+
<include name="**" />
3444
</fileset>
3545
</copy>
3646

3747
</target>
3848

3949
<target name="replace">
4050

41-
<copy file="pkg_junewsultra.xml" todir="${build}">
51+
<copy file="pkg_junewsultra.xml"
52+
todir="${build}">
4253
<filterchain>
4354
<replacetokens>
44-
<token key="version" value="${VERSION}" />
45-
<token key="date" value="${DATE}" />
46-
<token key="juimage" value="${juimage}" />
55+
<token key="version"
56+
value="${VERSION}" />
57+
<token key="date"
58+
value="${DATE}" />
59+
<token key="juimage"
60+
value="${juimage}" />
4761
</replacetokens>
4862
</filterchain>
4963
</copy>
5064

51-
<copy file="packages/mod_junewsultra/mod_junewsultra.xml" todir="${temp}/temp/mod_junewsultra">
65+
<copy file="packages/mod_junewsultra/mod_junewsultra.xml"
66+
todir="${temp}/temp/mod_junewsultra">
5267
<filterchain>
5368
<replacetokens>
54-
<token key="version" value="${VERSION}" />
55-
<token key="date" value="${DATE}" />
69+
<token key="version"
70+
value="${VERSION}" />
71+
<token key="date"
72+
value="${DATE}" />
5673
</replacetokens>
5774
</filterchain>
5875
</copy>
5976

60-
<delete file="${temp}/mod_junewsultra/mod_junewsultra.xml"/>
61-
<copy file="${temp}/temp/mod_junewsultra/mod_junewsultra.xml" todir="${temp}/mod_junewsultra"/>
77+
<delete file="${temp}/mod_junewsultra/mod_junewsultra.xml" />
78+
<copy file="${temp}/temp/mod_junewsultra/mod_junewsultra.xml"
79+
todir="${temp}/mod_junewsultra" />
6280

6381

64-
<copy file="packages/tmpl_mod_junewsultra_default/default.xml" todir="${temp}/temp/tmpl_mod_junewsultra_default">
82+
<copy file="packages/tmpl_mod_junewsultra_default/default.xml"
83+
todir="${temp}/temp/tmpl_mod_junewsultra_default">
6584
<filterchain>
6685
<replacetokens>
67-
<token key="version" value="${VERSION}" />
68-
<token key="date" value="${DATE}" />
86+
<token key="version"
87+
value="${VERSION}" />
88+
<token key="date"
89+
value="${DATE}" />
6990
</replacetokens>
7091
</filterchain>
7192
</copy>
7293

73-
<delete file="${temp}/tmpl_mod_junewsultra_default/default.xml"/>
74-
<copy file="${temp}/temp/tmpl_mod_junewsultra_default/default.xml" todir="${temp}/tmpl_mod_junewsultra_default"/>
94+
<delete file="${temp}/tmpl_mod_junewsultra_default/default.xml" />
95+
<copy file="${temp}/temp/tmpl_mod_junewsultra_default/default.xml"
96+
todir="${temp}/tmpl_mod_junewsultra_default" />
7597

7698
</target>
7799

78100
<target name="pack-plugins">
79101

80-
<mkdir dir="${build}/packages"/>
102+
<mkdir dir="${build}/packages" />
81103

82-
<zip destfile="${build}/packages/mod_junewsultra.zip" description="mod_junewsultra">
83-
<fileset dir="${temp}/mod_junewsultra"/>
104+
<zip destfile="${build}/packages/mod_junewsultra.zip"
105+
description="mod_junewsultra">
106+
<fileset dir="${temp}/mod_junewsultra" />
84107
</zip>
85108

86-
<zip destfile="${build}/packages/tmpl_mod_junewsultra_default.zip" description="tmpl_mod_junewsultra_default">
87-
<fileset dir="${temp}/tmpl_mod_junewsultra_default"/>
109+
<zip destfile="${build}/packages/tmpl_mod_junewsultra_default.zip"
110+
description="tmpl_mod_junewsultra_default">
111+
<fileset dir="${temp}/tmpl_mod_junewsultra_default" />
88112
</zip>
89113

90-
<copy file="../JUImage/dist/pkg_juimage_v${juimage}.zip" todir="${build}/packages"/>
114+
<copy file="../JUImage/dist/pkg_juimage_v${juimage}.zip"
115+
todir="${build}/packages" />
91116

92117
<copy todir="${build}/language">
93118
<fileset dir="${temp}/language">
94-
<include name="**"/>
119+
<include name="**" />
95120
</fileset>
96121
</copy>
97122

98-
<copy file="pkg_junewsultra.xml" todir="${build}"/>
123+
<copy file="pkg_junewsultra.xml"
124+
todir="${build}" />
99125

100-
<copy file="script.php" todir="${build}"/>
126+
<copy file="script.php"
127+
todir="${build}" />
101128

102129
</target>
103130

104-
<target name="dist" depends="init, temp, replace, pack-plugins">
131+
<target name="dist"
132+
depends="init, temp, replace, pack-plugins">
105133
<zip destfile="${dist}/${filename}">
106134
<fileset dir="${build}/">
107-
<include name="**/**"/>
135+
<include name="**/**" />
108136
</fileset>
109137
</zip>
110138

111-
<delete dir="${build}"/>
112-
<delete dir="${temp}"/>
139+
<delete dir="${build}" />
140+
<delete dir="${temp}" />
113141

114142
</target>
115143

116144
<target name="clean">
117145

118-
<delete dir="${build}"/>
119-
<delete dir="${temp}"/>
146+
<delete dir="${build}" />
147+
<delete dir="${temp}" />
120148

121149
</target>
122150

‎packages/mod_junewsultra/Helper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ public function xml($feed_url, $xmlcount, $cache_file, $time, $path, $ordering_x
594594
switch($ordering_xml)
595595
{
596596
case 'rand':
597-
$items = $xml->xpath(sprintf($path . '[position()]'));
597+
$items = $xml->xpath(sprintf($path . '[position()]', $xmlcount));
598598
shuffle($items);
599599
$items = array_slice($items, 0, $xmlcount);
600600
break;

‎packages/mod_junewsultra/fields/multicategories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected function getOptions()
7373
$tables = $db->getTableList();
7474
$dbprefix = $db->getPrefix();
7575

76-
if(in_array($dbprefix . $dbtable, $tables))
76+
if(in_array($dbprefix . $dbtable, $tables, true))
7777
{
7878
$db->setQuery($sql);
7979
$results = $db->loadObjectList();

‎packages/mod_junewsultra/fields/uploadimg.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function alert($text, $error)
9393
$filename = $_FILES[ 'userfile' ][ 'tmp_name' ];
9494
$ext = pathinfo($_FILES[ 'userfile' ][ 'name' ])[ 'extension' ];
9595

96-
if(!in_array($ext, $valid_types))
96+
if(!in_array($ext, $valid_types, true))
9797
{
9898
$alert = alert(JText::_('MOD_JUNEWS_ERROR2'), 'notice');
9999
}

0 commit comments

Comments
 (0)