Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 15 commits
  • 46 files changed
  • 0 commit comments
  • 1 contributor
Showing with 3,348 additions and 88 deletions.
  1. +1 −1  contrib/convert.xml
  2. +1 −1  contrib/de.xml
  3. +1 −1  contrib/de_subsilver2.xml
  4. +19 −1 contrib/history.xml
  5. +1 −1  contrib/plugins/highslide.xml
  6. +1 −1  contrib/plugins/lytebox.xml
  7. +1 −1  contrib/plugins/shadowbox.xml
  8. +1 −1  contrib/subsilver2.xml
  9. +2,655 −0 contrib/update_1_1_5_to_1_1_6/modx.prosilver.en.xsl
  10. +88 −0 contrib/update_1_1_5_to_1_1_6/update.xml
  11. +3 −1 install.xml
  12. +2 −2 non-contrib/Release-Post_de.txt
  13. +2 −2 non-contrib/Release-Post_en.txt
  14. +2 −2 non-contrib/phpbb_gallery.xml
  15. +1 −1  root/adm/mods/phpbb_gallery_version.php
  16. +2 −2 root/adm/style/gallery_permissions.html
  17. +73 −0 root/develop/check_duplicated_language_keys.php
  18. +24 −0 root/develop/lfcd/lang.php
  19. +371 −0 root/develop/lfcd/lfcd.php
  20. +2 −2 root/gallery/album.php
  21. +4 −13 root/gallery/index.php
  22. +1 −1  root/gallery/mcp.php
  23. +4 −0 root/gallery/posting.php
  24. +1 −1  root/gallery/search.php
  25. +4 −3 root/includes/acp/acp_gallery.php
  26. +1 −1  root/includes/acp/acp_gallery_albums.php
  27. +1 −1  root/includes/acp/acp_gallery_config.php
  28. +1 −1  root/includes/gallery/album.php
  29. +4 −4 root/includes/gallery/feed.php
  30. +9 −4 root/includes/gallery/image/file.php
  31. +3 −3 root/includes/gallery/integration.php
  32. +3 −3 root/includes/gallery/mcp.php
  33. +2 −2 root/includes/gallery/upload.php
  34. +2 −2 root/includes/ucp/ucp_gallery.php
  35. +1 −1  root/install/index.php
  36. +2 −0  root/install/install_convert_ts.php
  37. +22 −11 root/language/de/mods/gallery.php
  38. +2 −0  root/language/de/mods/gallery_acp.php
  39. +22 −11 root/language/en/mods/gallery.php
  40. +2 −0  root/language/en/mods/gallery_acp.php
  41. +1 −1  root/styles/prosilver/template/gallery/imageblock_body.html
  42. +1 −1  root/styles/prosilver/template/gallery/mcp_body.html
  43. +1 −1  root/styles/prosilver/template/gallery/viewimage_body.html
  44. +1 −1  root/styles/subsilver2/template/gallery/imageblock_body.html
  45. +1 −1  root/styles/subsilver2/template/gallery/mcp_body.html
  46. +1 −1  root/styles/subsilver2/template/gallery/viewimage_body.html
View
2  contrib/convert.xml
@@ -33,7 +33,7 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>intermediate</level>
View
2  contrib/de.xml
@@ -29,7 +29,7 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>intermediate</level>
View
2  contrib/de_subsilver2.xml
@@ -29,7 +29,7 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>intermediate</level>
View
20 contrib/history.xml
@@ -188,7 +188,7 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>intermediate</level>
@@ -198,6 +198,24 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
<history>
<entry>
+ <date>2012-04-13</date>
+ <rev-version>1.1.6</rev-version>
+ <changelog lang="en">
+ <change><![CDATA[[Fix] Fix "Undefined variable: poster_id" when viewing a pm (Bug #954)]]></change>
+ <change><![CDATA[[Fix] Correctly list personal albums of deleted users (Bug #957)]]></change>
+ <change><![CDATA[[Fix] Fix SQL error in ACP with PostgreSQL (Bug #955)]]></change>
+ <change><![CDATA[[Fix] Images with dots in the name are not extracted from zips (Bug #953)]]></change>
+ <change><![CDATA[[Fix] Do not append_sid to links in feed.php (Bug #952)]]></change>
+ <change><![CDATA[[Fix] Add a short explanation for the permission cases (Bug #951)]]></change>
+ <change><![CDATA[[Fix] Fix automated subscription when uploading images (Bug #925)]]></change>
+ <change><![CDATA[[Fix] Fix overwriting of core language keys and other language stuff (Bug #944)]]></change>
+ <change><![CDATA[[Fix] Fix "Undefined variable: umil" in TS convertor (Bug #948)]]></change>
+ <change><![CDATA[[Fix] Fix background of the image-size line on thumbnails (Bug #946)]]></change>
+ <change><![CDATA[[Fix] Can not select a member when creating personal gallery in ACP (Bug #950)]]></change>
+ </changelog>
+ </entry>
+
+ <entry>
<date>2012-02-28</date>
<rev-version>1.1.5</rev-version>
<changelog lang="en">
View
2  contrib/plugins/highslide.xml
@@ -42,7 +42,7 @@ http://creativecommons.org/licenses/by-nc/2.5/]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>easy</level>
View
2  contrib/plugins/lytebox.xml
@@ -39,7 +39,7 @@ http://creativecommons.org/licenses/by/3.0/]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>easy</level>
View
2  contrib/plugins/shadowbox.xml
@@ -40,7 +40,7 @@ http://shadowbox-js.com/LICENSE]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>easy</level>
View
2  contrib/subsilver2.xml
@@ -29,7 +29,7 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>intermediate</level>
View
2,655 contrib/update_1_1_5_to_1_1_6/modx.prosilver.en.xsl
2,655 additions, 0 deletions not shown
View
88 contrib/update_1_1_5_to_1_1_6/update.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
+<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
+<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.phpbb.com/mods/xml/modx-1.2.5.xsd">
+ <header>
+ <license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
+
+ <title lang="de"><![CDATA[phpBB Gallery » Update 1.1.5 nach 1.1.6]]></title>
+ <title lang="en"><![CDATA[phpBB Gallery » Update 1.1.5 to 1.1.6]]></title>
+
+ <description lang="de"><![CDATA[Update-Anleitung]]></description>
+ <description lang="en"><![CDATA[Update-Manual]]></description>
+
+ <author-notes lang="de"><![CDATA[
+Diese MOD benötigt php5.
+
+Untersützt die "MOD Version Check"-MOD von Handyman´:
+http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
+ <author-notes lang="en"><![CDATA[
+This MOD requires php5.
+
+Supports the "MOD Version Check"-MOD by Handyman´:
+http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
+
+ <author-group>
+ <author>
+ <realname>Joas Schilling</realname>
+ <email>nickvergessen@gmx.de</email>
+ <username>nickvergessen</username>
+ <homepage>http://www.flying-bits.org/</homepage>
+ <contributions />
+ </author>
+ </author-group>
+
+ <mod-version>1.1.6</mod-version>
+
+ <installation>
+ <level>intermediate</level>
+ <time>1200</time>
+ <target-version>3.0.10</target-version>
+ </installation>
+
+ <link-group>
+ <link type="contrib" lang="de" href="../history.xml">Geschichte/Entwickler/Features</link>
+ <link type="contrib" lang="en" href="../history.xml">History/Developers/Features</link>
+ <link type="parent" lang="de" href="../../install.xml">Installations-Anleitung</link>
+ <link type="parent" lang="en" href="../../install.xml">Install</link>
+ <link type="contrib" lang="de" href="../plugins/highslide.xml">Plugin Highslide JS</link>
+ <link type="contrib" lang="en" href="../plugins/highslide.xml">Plugin Highslide JS</link>
+ <link type="contrib" lang="de" href="../plugins/lytebox.xml">Plugin Lytebox</link>
+ <link type="contrib" lang="en" href="../plugins/lytebox.xml">Plugin Lytebox</link>
+ <link type="contrib" lang="de" href="../plugins/shadowbox.xml">Plugin Shadowbox</link>
+ <link type="contrib" lang="en" href="../plugins/shadowbox.xml">Plugin Shadowbox</link>
+ </link-group>
+ </header>
+
+ <action-group>
+ <copy>
+ <file from="root/adm/mods/phpbb_gallery_version.php" to="adm/mods/phpbb_gallery_version.php" />
+ <file from="root/adm/style/*.*" to="adm/style/*.*" />
+ <file from="root/gallery/*.*" to="gallery/*.*" />
+ <file from="root/includes/*.*" to="includes/*.*" />
+ <file from="root/install/*.*" to="install/*.*" />
+ <file from="root/language/en/*.*" to="language/en/*.*" />
+ <file from="root/styles/prosilver/*.*" to="styles/prosilver/*.*" />
+ <file from="root/umil/*.*" to="umil/*.*" />
+ </copy>
+
+ <php-installer>install/index.php</php-installer>
+
+ <diy-instructions lang="de"><![CDATA[Rufe install/ auf und führe das Update-Script aus
+
+Leere den Cache im "Administrations-Bereich" (ACP) > "Allgemein" > "Den Cache leeren"
+
+Aktualisiere deine Styles:
+ "Administrations-Bereich" (ACP) > "Styles" > "Templates" > jedes > "Aktualisieren"
+ "Administrations-Bereich" (ACP) > "Styles" > "Themes" > jedes > "Aktualisieren"
+ "Administrations-Bereich" (ACP) > "Styles" > "Grafiksammlungen" > jedes > "Aktualisieren"]]></diy-instructions>
+ <diy-instructions lang="en"><![CDATA[Browse to install/ and run the update-script
+
+Clear your cache in the "Administration Control Panel" (ACP) > "General" > "Purge the cache"
+
+Refresh your Styles:
+ "Administration Control Panel" (ACP) > "Styles" > "Templates" > each > "refresh"
+ "Administration Control Panel" (ACP) > "Styles" > "Themes" > each > "refresh"
+ "Administration Control Panel" (ACP) > "Styles" > "Imagesets" > each > "refresh"]]></diy-instructions>
+ </action-group>
+</mod>
View
4 install.xml
@@ -37,7 +37,7 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
</author>
</author-group>
- <mod-version>1.1.5</mod-version>
+ <mod-version>1.1.6</mod-version>
<installation>
<level>intermediate</level>
@@ -60,6 +60,8 @@ http://www.phpbb.com/community/viewtopic.php?f=69&t=691155]]></author-notes>
<link type="contrib" lang="en" href="contrib/update_1_1_3_to_1_1_4/update.xml">Update from 1.1.3 to 1.1.4</link>
<link type="contrib" lang="de" href="contrib/update_1_1_4_to_1_1_5/update.xml">Update von 1.1.4 auf 1.1.5</link>
<link type="contrib" lang="en" href="contrib/update_1_1_4_to_1_1_5/update.xml">Update from 1.1.4 to 1.1.5</link>
+ <link type="contrib" lang="de" href="contrib/update_1_1_5_to_1_1_6/update.xml">Update von 1.1.5 auf 1.1.6</link>
+ <link type="contrib" lang="en" href="contrib/update_1_1_5_to_1_1_6/update.xml">Update from 1.1.5 to 1.1.6</link>
<link type="language" lang="de" href="contrib/de.xml">Anleitung für das deutsche Sprachpaket</link>
<link type="language" lang="en" href="contrib/de.xml">Manual for German Language-set</link>
<link type="template" lang="de" href="contrib/subsilver2.xml">Anleitung für das Style subsilver2</link>
View
4 non-contrib/Release-Post_de.txt
@@ -1,4 +1,4 @@
-[b]Version:[/b] 1.1.5
+[b]Version:[/b] 1.1.6
[b]Beschreibung:[/b] Eine Bilder-Galerie, die in dein phpBB integriert wird.
[b]Features:[/b] Die Liste mit (fast) allen Features: http://www.flying-bits.org/go/phpbb_gallery/features
@@ -14,4 +14,4 @@
[b]Paypal-Spende[/b]:
Wenn dir die MOD gef�llt, kannst du dich gerne mit einer kleinen [url=http://www.flying-bits.org/paypal.php]Paypal-Spende[/url] daf�r revangieren. (nickvergessen Q gmx.de / Q=@).
-[b]Downloads:[/b] [size=150][b][url=http://www.flying-bits.org/go/phpbb_gallery/download]Download v1.1.5[/url][/b][/size]
+[b]Downloads:[/b] [size=150][b][url=http://www.flying-bits.org/go/phpbb_gallery/download]Download v1.1.6[/url][/b][/size]
View
4 non-contrib/Release-Post_en.txt
@@ -1,4 +1,4 @@
-[b]Version:[/b] 1.1.5
+[b]Version:[/b] 1.1.6
[b]Description:[/b] An image-gallery integrated into your phpbb-board.
[b]Features:[/b] For a (nearly) full feature list see http://www.flying-bits.org/go/phpbb_gallery/features
@@ -14,4 +14,4 @@
[b]Paypal-Donation[/b]:
As developing a modification like this, takes a lot of time, I would appreciate if you make a little [url=http://www.flying-bits.org/paypal.php]donation[/url] (nickvergessen Q gmx.de / Q=@).
-[b]Downloads:[/b] [size=150][b][url=http://www.flying-bits.org/go/phpbb_gallery/download]Download v1.1.5[/url][/b][/size]
+[b]Downloads:[/b] [size=150][b][url=http://www.flying-bits.org/go/phpbb_gallery/download]Download v1.1.6[/url][/b][/size]
View
4 non-contrib/phpbb_gallery.xml
@@ -10,7 +10,7 @@ Features: http://www.flying-bits.org/go/phpbb_gallery/features</description>
<mod_version>
<major>1</major>
<minor>1</minor>
- <revision>5</revision>
+ <revision>6</revision>
<release></release>
</mod_version>
<installation>
@@ -42,7 +42,7 @@ Features: http://www.flying-bits.org/go/phpbb_gallery/features</description>
<mod_version>
<major>1</major>
<minor>1</minor>
- <revision>5</revision>
+ <revision>6</revision>
<release></release>
</mod_version>
<installation>
View
2  root/adm/mods/phpbb_gallery_version.php
@@ -25,7 +25,7 @@ function version()
'author' => 'nickvergessen',
'title' => 'phpBB Gallery',
'tag' => 'phpbb_gallery',
- 'version' => '1.1.5',
+ 'version' => '1.1.6',
'file' => array('www.flying-bits.org', 'updatecheck', 'phpbb_gallery.xml'),
);
}
View
4 root/adm/style/gallery_permissions.html
@@ -91,8 +91,8 @@
<dl><dt><input id="p_system_0" name="p_system" class="radio" type="radio" checked="checked" value="0" /><label for="p_system_0">&nbsp;{L_SELECTED_ALBUMS}</label></dt>
<dd><select id="target" name="album_id[]" multiple="multiple">{ALBUM_LIST}</select></dd>
</dl>
- <dl><dt><input id="p_system_2" name="p_system" class="radio" type="radio" value="{C_OWN_PERSONAL_ALBUMS}" /><label for="p_system_2">&nbsp;{L_OWN_PERSONAL_ALBUMS}</label></dt></dl>
- <dl><dt><input id="p_system_3" name="p_system" class="radio" type="radio" value="{C_PERSONAL_ALBUMS}" /><label for="p_system_3">&nbsp;{L_PERSONAL_ALBUMS}</label></dt></dl>
+ <dl><dt><input id="p_system_2" name="p_system" class="radio" type="radio" value="{C_OWN_PERSONAL_ALBUMS}" /><label for="p_system_2">&nbsp;{L_OWN_PERSONAL_ALBUMS}</label><br /><span>{L_OWN_PERSONAL_ALBUMS_EXPLAIN}</span></dt></dl>
+ <dl><dt><input id="p_system_3" name="p_system" class="radio" type="radio" value="{C_PERSONAL_ALBUMS}" /><label for="p_system_3">&nbsp;{L_PERSONAL_ALBUMS}</label><br /><span>{L_PERSONAL_ALBUMS_EXPLAIN}</span></dt></dl>
</fieldset>
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>
View
73 root/develop/check_duplicated_language_keys.php
@@ -0,0 +1,73 @@
+<?php
+/**
+*
+* @package Language File Conflict Detector
+* @version $Id$
+* @copyright (c) 2012 nickvergessen nickvergessen@gmx.de http://www.flying-bits.org
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* The path to your phpBB root file (the one with the config file)
+*/
+$phpbb_root_path = '../';
+
+/**
+* Languages to test
+*/
+$languages = array(
+ 'en',
+);
+
+/**
+* YOUR LANGUAGE FILES
+*/
+$mod_files = array(
+ 'mods/exif_data',
+ 'mods/gallery',
+ 'mods/gallery_acp',
+ 'mods/gallery_mcp',
+ 'mods/gallery_ucp',
+ 'mods/info_acp_gallery',
+ 'mods/info_acp_gallery_logs',
+ 'mods/info_ucp_gallery',
+ 'mods/install_gallery',
+ 'mods/permissions_gallery',
+);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+include($phpbb_root_path . 'common.' . $phpEx);
+
+// Start session management
+$user->session_begin();
+$auth->acl($user->data);
+$user->setup();
+
+include('lfcd/lfcd.' . $phpEx);
+
+$lfcd = new lfcd();
+$lfcd->validate($mod_files);
+
+echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-gb" xml:lang="en-gb">
+<head>
+<title>LFCD</title>
+<meta content="text/html; charset=UTF-8" http-equiv="content-type">
+</head>
+<body>';
+echo $lfcd->get_report();
+echo '</body>
+</html>';
+
+
+
+
+
+
+
+
+
+
View
24 root/develop/lfcd/lang.php
@@ -0,0 +1,24 @@
+<?php
+/**
+*
+* @package Language File Conflict Detector
+* @version $Id$
+* @copyright (c) 2012 nickvergessen nickvergessen@gmx.de http://www.flying-bits.org
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+$lfcd_lang = array(
+ 'LFCD_TESTING_FILES' => "[b][size=150]Testing language files:[/size][/b]\n%s",
+ 'LFCD_CONFLICTS' => '[b][size=150]Conflicts:[/size][/b]',
+ 'LFCD_STATISTIC' => '[b][size=150]Statistic:[/size][/b]',
+ 'LFCD_STATISTIC_FILE' => '[b]%1$s:[/b] [b][color=red]%2$s[/color][/b] Fails, [b][color=orange]%3$s[/color][/b] Warnings, [b][color=blue]%4$s[/color][/b] Notices, [b][color=purple]%5$s[/color][/b] Infos',
+ 'LFCD_STATISTIC_PERMISSION' => '[b]%1$s:[/b] [color=#008080]Permission files are currently not supported![/color]',
+ 'LFCD_CONFLICT' => 'MOD´s language file [b]"%1$s"[/b] conflicts with phpBB´s language file [b]"%2$s"[/b] on key [b]"%3$s"[/b]:' . "\n". 'MOD:[code]%4$s[/code]phpBB:[code]%5$s[/code]',
+ 'LFCD_FAIL_RESULT' => 'Fail',
+ 'LFCD_INFO_RESULT' => 'Info',
+ 'LFCD_NOTICE_RESULT' => 'Notice',
+ 'LFCD_PERMISSION_MESSAGE' => 'Permission files are currently not supported!',
+ 'LFCD_PERMISSION_RESULT' => 'Note',
+ 'LFCD_WARNING_RESULT' => 'Warning',
+);
View
371 root/develop/lfcd/lfcd.php
@@ -0,0 +1,371 @@
+<?php
+/**
+*
+* @package Language File Conflict Detector
+* @version $Id$
+* @copyright (c) 2012 nickvergessen nickvergessen@gmx.de http://www.flying-bits.org
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class lfcd
+{
+ /**
+ * Constant for "fail" error
+ */
+ const ERROR_FAIL = 1;
+
+ /**
+ * Constant for warnings
+ */
+ const ERROR_WARNING = 2;
+
+ /**
+ * Constant for notices
+ */
+ const ERROR_NOTICE = 3;
+
+ /**
+ * Constant for information notices
+ */
+ const ERROR_INFO = 4;
+
+ /**
+ * Constant for permission errors
+ */
+ const ERROR_PERMISSION = 5;
+
+ /**
+ * Output validation report as plain text
+ */
+ const OUTPUT_TEXT = 0;
+
+ /*
+ * Output validation report as BBcode
+ */
+ const OUTPUT_BBCODE = 1;
+
+ /**
+ * Output validation report as HTML
+ */
+ const OUTPUT_HTML = 2;
+
+ /**
+ * The language we want to check
+ */
+ private $language = '';
+
+ /**
+ * The MOD files we want to check
+ */
+ private $mod_files = array();
+
+ /**
+ * All phpBB files
+ */
+ private $phpbb_files = array(
+ 'acp/attachments',
+ 'acp/ban',
+ 'acp/board',
+ 'acp/bots',
+ 'acp/common',
+ 'acp/database',
+ 'acp/email',
+ 'acp/forums',
+ 'acp/groups',
+ 'acp/language',
+ 'acp/mods',
+ 'acp/modules',
+ 'acp/permissions',
+ 'acp/permissions_phpbb',
+ 'acp/posting',
+ 'acp/profile',
+ 'acp/prune',
+ 'acp/search',
+ 'acp/styles',
+ 'acp/users',
+ 'captcha_qa',
+ 'captcha_recaptcha',
+ 'common',
+ 'groups',
+ 'install',
+ 'mcp',
+ 'memberlist',
+ 'posting',
+ 'search',
+ 'ucp',
+ 'viewforum',
+ 'viewtopic',
+ );
+
+ /**
+ * The phpBB files we ignore
+ */
+ private $ignore_phpbb_files = array(
+ 'help_bbcode',
+ 'help_faq',
+ 'search_ignore_words',
+ 'search_synonyms',
+ );
+
+ /**
+ * Errors which were encountered during testing
+ */
+ private $errors;
+ private $error_files;
+
+ /**
+ * Our pre-formatted PM content
+ */
+ private $message;
+
+ public function __construct($ignore_phpbb_files = null, $language = 'en')
+ {
+ if ($ignore_phpbb_files != null)
+ {
+ if (is_array($ignore_phpbb_files))
+ {
+ $this->ignore_phpbb_files = $ignore_phpbb_files;
+ }
+ else
+ {
+ $this->ignore_phpbb_files = array();
+ }
+ }
+
+ $this->language = $language;
+ $this->errors = array();
+ $this->error_files = array();
+ $this->message = '';
+
+ global $phpEx, $lfcd_lang;
+ include('lang.' . $phpEx);
+ }
+
+ public function validate($mod_files = array())
+ {
+ global $phpbb_root_path, $phpEx, $lfcd_lang;
+
+ $this->mod_files = $mod_files;
+ $this->errors = array();
+ $this->error_files = array();
+ $this->message = '';
+
+ if (!file_exists($phpbb_root_path . 'language/' . $this->language . '/'))
+ {
+ //echo '<h3>Error: language-package "' . $this->language . '" could not be found!</h3>';
+ continue;
+ }
+
+ foreach ($this->mod_files as $mod_file)
+ {
+ include($phpbb_root_path . 'language/' . $this->language . '/' . $mod_file . '.' . $phpEx);
+ $mod_lang = $lang;
+ $lang = null;
+
+ foreach ($this->phpbb_files as $phpbb_file)
+ {
+ if (in_array($phpbb_file, $this->ignore_phpbb_files))
+ {
+ continue;
+ }
+
+ include($phpbb_root_path . 'language/' . $this->language . '/' . $phpbb_file . '.' . $phpEx);
+ $phpbb_lang = $lang;
+ $lang = null;
+
+ $conflicting_keys = array_keys(array_intersect_key($mod_lang, $phpbb_lang));
+ if (!empty($conflicting_keys))
+ {
+ foreach ($conflicting_keys as $conflict)
+ {
+ $this->push_error($mod_file, $phpbb_file, $conflict, $mod_lang, $phpbb_lang);
+ }
+ }
+ }
+ }
+ }
+
+ private function push_error($mod_file, $phpbb_file, $conflict, $mod_lang, $phpbb_lang)
+ {
+ global $lfcd_lang;
+ $type = $this->get_error_type($mod_file, $phpbb_file);
+
+ switch ($type)
+ {
+ case self::ERROR_FAIL:
+ $this->message .= '[color=red][ [b]' . $lfcd_lang['LFCD_FAIL_RESULT'] . '[/b] ][/color] ';
+ break;
+
+ case self::ERROR_NOTICE:
+ $this->message .= '[color=blue][ [b]' . $lfcd_lang['LFCD_NOTICE_RESULT'] . '[/b] ][/color] ';
+ break;
+
+ case self::ERROR_WARNING:
+ $this->message .= '[color=orange][ [b]' . $lfcd_lang['LFCD_WARNING_RESULT'] . '[/b] ][/color] ';
+ break;
+
+ case self::ERROR_INFO:
+ $this->message .= '[color=purple][ [b]' . $lfcd_lang['LFCD_INFO_RESULT'] . '[/b] ][/color] ';
+ break;
+
+ case self::ERROR_PERMISSION:
+ $this->message .= '[color=#008080][ [b]' . $lfcd_lang['LFCD_PERMISSION_RESULT'] . '[/b] ][/color] ' . $lfcd_lang['LFCD_PERMISSION_MESSAGE'];
+ break;
+
+ default:
+ return;
+ //$this->message .= '[color=orange][ [b]' . $lfcd_lang['LFCD_WARNING_RESULT'] . '[/b] ][/color] [b]' . $lfcd_lang['LFCD_INVALID_TYPE'] . "\n";
+ //$this->message .= '[color=purple][ [b]' . $lfcd_lang['LFCD_INFO_RESULT'] . '[/b] ][/color] ' . $message . "\n";
+ }
+
+ if ($type != self::ERROR_PERMISSION)
+ {
+ $this->message .= sprintf(
+ $lfcd_lang['LFCD_CONFLICT'],
+ $mod_file,
+ $phpbb_file,
+ $conflict,
+ self::to_string($mod_lang[$conflict]),
+ self::to_string($phpbb_lang[$conflict])
+ ) . "\n\n";
+
+ $this->errors[$type][] = array(
+ 'mod_file' => $mod_file,
+ 'phpbb_file' => $phpbb_file,
+ 'conflict' => $conflict,
+ 'mod_lang' => $mod_lang,
+ 'phpbb_lang' => $phpbb_lang,
+ );
+ }
+
+ $this->error_files[$mod_file][$type][] = array(
+ 'mod_file' => $mod_file,
+ 'phpbb_file' => $phpbb_file,
+ 'conflict' => $conflict,
+ 'mod_lang' => $mod_lang,
+ 'phpbb_lang' => $phpbb_lang,
+ );
+ }
+
+ public function get_report($output = self::OUTPUT_HTML)
+ {
+ global $lfcd_lang;
+ $return = sprintf($lfcd_lang['LFCD_TESTING_FILES'], implode(",\n", $this->mod_files)) . "\n\n ";
+ $return .= $lfcd_lang['LFCD_STATISTIC'] . "\n";
+
+ foreach ($this->error_files as $file => $errors)
+ {
+ if (!isset($errors[self::ERROR_PERMISSION]))
+ {
+ $return .= sprintf(
+ $lfcd_lang['LFCD_STATISTIC_FILE'],
+ $file,
+ (isset($errors[self::ERROR_FAIL]) ? sizeof($errors[self::ERROR_FAIL]) : '[/color][color=black]0'),
+ (isset($errors[self::ERROR_WARNING]) ? sizeof($errors[self::ERROR_WARNING]) : '[/color][color=black]0'),
+ (isset($errors[self::ERROR_NOTICE]) ? sizeof($errors[self::ERROR_NOTICE]) : '[/color][color=black]0'),
+ (isset($errors[self::ERROR_INFO]) ? sizeof($errors[self::ERROR_INFO]) : '[/color][color=black]0')
+ ) . "\n";
+ }
+ else
+ {
+ $return .= sprintf($lfcd_lang['LFCD_STATISTIC_PERMISSION'], $file) . "\n";
+ }
+ }
+ $return .= "\n\n";
+ $return .= $lfcd_lang['LFCD_CONFLICTS'] . "\n";
+
+ switch ($output)
+ {
+ case self::OUTPUT_BBCODE:
+ $text = htmlspecialchars($return . $this->message);
+ return self::generate_text_for_html_display($text, true);
+
+ case self::OUTPUT_HTML:
+ $text = htmlspecialchars($return . $this->message);
+ return self::generate_text_for_html_display($text);
+
+ case self::OUTPUT_TEXT:
+ $text = htmlspecialchars($return . $this->message);
+ $text = self::generate_text_for_html_display($text);
+ //$text = htmlspecialchars_decode(strip_tags(str_replace('<br />', "\n", $text)));
+ $text = str_replace("\n\n", "\n", $text);
+ $text = str_replace("\n", PHP_EOL, $text);
+ return $text;
+ }
+ }
+
+ private function get_error_type($mod_file, $phpbb_file)
+ {
+ if (strpos($mod_file, 'permission') !== false && strpos($phpbb_file, 'permission') !== false)
+ {
+ return self::ERROR_PERMISSION;
+ }
+
+ if ((strpos($mod_file, 'mods/info_acp_') === 0 && strpos($phpbb_file, 'acp/') === 0) ||
+ (strpos($mod_file, 'mods/info_mcp_') === 0 && $phpbb_file == 'mcp') ||
+ (strpos($mod_file, 'mods/info_ucp_') === 0 && $phpbb_file == 'ucp') ||
+ (strpos($mod_file, 'acp') !== false && $phpbb_file == 'acp/common') ||
+ ($phpbb_file == 'common'))
+ {
+ return self::ERROR_FAIL;
+ }
+
+ if ((strpos($mod_file, 'acp') === false && strpos($phpbb_file, 'acp/') === 0))
+ {
+ return self::ERROR_NOTICE;
+ }
+
+ if (strpos($mod_file, 'install') || strpos($phpbb_file, 'install'))
+ {
+ return self::ERROR_INFO;
+ }
+
+ return self::ERROR_WARNING;
+ }
+
+ /**
+ * Display validation results as HTML
+ */
+ static public function generate_text_for_html_display($text, $soft = false)
+ {
+ //Replace new
+ $text = str_replace("\n", "<br />\n", $text);
+ if ($soft)
+ {
+ return $text;
+ }
+
+ //BBCode replacement array
+ $bbcode = array(
+ "/\[b\](.*?)\[\/b\]/is" => '<span style="font-weight:bold;">$1</span>',
+ "/\[u\](.*?)\[\/u\]/is" => '<span style="text-decoration:underline;">$1</span>',
+ "/\[color\=(.*?)\](.*?)\[\/color\]/is" => '<span style="color:$1;">$2</span>',
+ "/\[code\](.*?)\[\/code\]/is" => '<pre style="padding-left:20px;">$1</pre>',
+ '#\[url(=(.*))?\](.*)\[/url\]#iUe' => "validate_url('\$2', '\$3')",
+ "/\[size\=(.*?)\](.*?)\[\/size\]/is" => '<span style="font-size: $1%;">$2</span>',
+ );
+
+ //Replace BBCode
+ $text = preg_replace(array_keys($bbcode), array_values($bbcode), $text);
+
+ return $text;
+ }
+
+ /**
+ * Convert the language entry to a beautiful string
+ */
+ static public function to_string($mixed, $depth = 0)
+ {
+ if (!is_array($mixed))
+ {
+ return /*str_repeat("\t", $depth) . */$mixed . "\n";
+ }
+ $return = str_repeat("\t", $depth) . "Array(\n";
+ foreach ($mixed as $key => $value)
+ {
+ $return .= str_repeat("\t", $depth + 1) . $key . ' => ' . self::to_string($value, $depth + 1);
+ }
+ return $return . str_repeat("\t", $depth) . ")\n";
+ }
+}
View
4 root/gallery/album.php
@@ -128,7 +128,7 @@
* Build the sort options
*/
$limit_days = array(0 => $user->lang['ALL_IMAGES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
- $sort_by_text = array('t' => $user->lang['TIME'], 'n' => $user->lang['IMAGE_NAME'], 'vc' => $user->lang['VIEWS']);
+ $sort_by_text = array('t' => $user->lang['TIME'], 'n' => $user->lang['IMAGE_NAME'], 'vc' => $user->lang['GALLERY_VIEWS']);
$sort_by_sql = array('t' => 'image_time', 'n' => 'image_name_clean', 'vc' => 'image_view_count');
// Do not sort images after upload-username on running contests, and of course ratings aswell!
@@ -313,7 +313,7 @@
'S_RETURN_LINK' => $user->lang['GALLERY'],
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('album', "album_id=$album_id&amp;sk=$sort_key&amp;sd=$sort_dir&amp;st=$sort_days"), $image_counter, $images_per_page, $start),
- 'TOTAL_IMAGES' => ($image_counter == 1) ? $user->lang['IMAGE_#'] : sprintf($user->lang['IMAGES_#'], $image_counter),
+ 'TOTAL_IMAGES' => $user->lang('VIEW_ALBUM_IMAGES', $image_counter),
'PAGE_NUMBER' => on_page($image_counter, $images_per_page, $start),
'L_WATCH_TOPIC' => ($album_data['watch_id']) ? $user->lang['UNWATCH_ALBUM'] : $user->lang['WATCH_ALBUM'],
View
17 root/gallery/index.php
@@ -161,15 +161,6 @@
$gallery_block->display();
}
-// Set some stats, get posts count from forums data if we... hum... retrieve all forums data
-$total_images = phpbb_gallery_config::get('num_images');
-$total_comments = phpbb_gallery_config::get('num_comments');
-$total_pgalleries = phpbb_gallery_config::get('num_pegas');
-//@TODO: Use $user->lang()
-$l_total_image_s = ($total_images == 0) ? 'TOTAL_IMAGES_ZERO' : 'TOTAL_IMAGES_OTHER';
-$l_total_comment_s = ($total_comments == 0) ? 'TOTAL_COMMENTS_ZERO' : 'TOTAL_COMMENTS_OTHER';
-$l_total_pgallery_s = ($total_pgalleries == 0) ? 'TOTAL_PGALLERIES_ZERO' : 'TOTAL_PGALLERIES_OTHER';
-
// Grab group details for legend display
$legend = '';
if (phpbb_gallery_config::get('disp_whoisonline'))
@@ -256,10 +247,10 @@
// Output page
$template->assign_vars(array(
- 'TOTAL_IMAGES' => (phpbb_gallery_config::get('disp_statistic')) ? $user->lang('TOTAL_IMAGES_SPRINTF', $total_images) : '',
- 'TOTAL_COMMENTS' => (phpbb_gallery_config::get('allow_comments')) ? sprintf($user->lang[$l_total_comment_s], $total_comments) : '',
- 'TOTAL_PGALLERIES' => (phpbb_gallery::$auth->acl_check('a_list', phpbb_gallery_auth::PERSONAL_ALBUM)) ? sprintf($user->lang[$l_total_pgallery_s], $total_pgalleries) : '',
- 'NEWEST_PGALLERIES' => ($total_pgalleries) ? sprintf($user->lang['NEWEST_PGALLERY'], get_username_string('full', phpbb_gallery_config::get('newest_pega_user_id'), phpbb_gallery_config::get('newest_pega_username'), phpbb_gallery_config::get('newest_pega_user_colour'), '', phpbb_gallery_url::append_sid('album', 'album_id=' . phpbb_gallery_config::get('newest_pega_album_id')))) : '',
+ 'TOTAL_IMAGES' => (phpbb_gallery_config::get('disp_statistic')) ? $user->lang('TOTAL_IMAGES_SPRINTF', phpbb_gallery_config::get('num_images')) : '',
+ 'TOTAL_COMMENTS' => (phpbb_gallery_config::get('allow_comments')) ? $user->lang('TOTAL_COMMENTS_SPRINTF', phpbb_gallery_config::get('num_comments')) : '',
+ 'TOTAL_PGALLERIES' => (phpbb_gallery::$auth->acl_check('a_list', phpbb_gallery_auth::PERSONAL_ALBUM)) ? $user->lang('TOTAL_PEGAS_SPRINTF', phpbb_gallery_config::get('num_pegas')) : '',
+ 'NEWEST_PGALLERIES' => (phpbb_gallery_config::get('num_pegas')) ? sprintf($user->lang['NEWEST_PGALLERY'], get_username_string('full', phpbb_gallery_config::get('newest_pega_user_id'), phpbb_gallery_config::get('newest_pega_username'), phpbb_gallery_config::get('newest_pega_user_colour'), '', phpbb_gallery_url::append_sid('album', 'album_id=' . phpbb_gallery_config::get('newest_pega_album_id')))) : '',
'S_DISP_LOGIN' => phpbb_gallery_config::get('disp_login'),
'S_DISP_WHOISONLINE' => phpbb_gallery_config::get('disp_whoisonline'),
View
2  root/gallery/mcp.php
@@ -255,7 +255,7 @@
'EDIT_IMG' => $user->img('icon_post_edit', 'EDIT_IMAGE'),
'DELETE_IMG' => $user->img('icon_post_delete', 'DELETE_IMAGE'),
'ALBUM_NAME' => $album_data['album_name'],
- 'ALBUM_IMAGES' => $album_data['album_images'] . ' ' . (($album_data['album_images'] == 1) ? $user->lang['IMAGE'] : $user->lang['IMAGES']),
+ 'ALBUM_IMAGES' => $user->lang('IMAGE_COUNT', $album_data['album_images']) . ' ' . (($album_data['album_images'] == 1) ? $user->lang['IMAGE'] : $user->lang['IMAGES']),
'U_VIEW_ALBUM' => phpbb_gallery_url::append_sid('album', 'album_id=' . $album_id),
'U_MOD_ALBUM' => phpbb_gallery_url::append_sid('mcp', 'mode=album&amp;album_id=' . $album_id),
'U_MCP_OVERVIEW' => phpbb_gallery_url::append_sid('mcp', 'mode=overview'),
View
4 root/gallery/posting.php
@@ -457,6 +457,10 @@
foreach ($process->images as $image_id)
{
$success = $success && $process->update_image($image_id, !phpbb_gallery::$auth->acl_check('i_approve', $album_id, $album_data['album_user_id']), $album_data['album_contest']);
+ if (phpbb_gallery::$user->get_data('watch_own'))
+ {
+ phpbb_gallery_notification::add($image_id);
+ }
}
$message = '';
View
2  root/gallery/search.php
@@ -64,7 +64,7 @@
* Build the sort options
*/
$limit_days = array(0 => $user->lang['ALL_IMAGES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
-$sort_by_text = array('t' => $user->lang['TIME'], 'n' => $user->lang['IMAGE_NAME'], 'u' => $user->lang['SORT_USERNAME'], 'vc' => $user->lang['VIEWS']);
+$sort_by_text = array('t' => $user->lang['TIME'], 'n' => $user->lang['IMAGE_NAME'], 'u' => $user->lang['SORT_USERNAME'], 'vc' => $user->lang['GALLERY_VIEWS']);
$sort_by_sql = array('t' => 'image_time', 'n' => 'image_name_clean', 'u' => 'image_username_clean', 'vc' => 'image_view_count');
if (phpbb_gallery_config::get('allow_rates'))
View
7 root/includes/acp/acp_gallery.php
@@ -359,14 +359,14 @@ function overview()
$boarddays = (time() - $config['board_startdate']) / 86400;
$images_per_day = sprintf('%.2f', phpbb_gallery_config::get('num_images') / $boarddays);
- $sql = 'SELECT COUNT(album_user_id) num_albums
+ $sql = 'SELECT COUNT(album_user_id) AS num_albums
FROM ' . GALLERY_ALBUMS_TABLE . '
WHERE album_user_id = 0';
$result = $db->sql_query($sql);
$num_albums = (int) $db->sql_fetchfield('num_albums');
$db->sql_freeresult($result);
- $sql = 'SELECT SUM(filesize_upload) as stat, SUM(filesize_medium) as stat_medium, SUM(filesize_cache) as stat_cache
+ $sql = 'SELECT SUM(filesize_upload) AS stat, SUM(filesize_medium) AS stat_medium, SUM(filesize_cache) AS stat_cache
FROM ' . GALLERY_IMAGES_TABLE;
$result = $db->sql_query($sql);
$dir_sizes = $db->sql_fetchrow($result);
@@ -385,10 +385,11 @@ function overview()
'MEDIUM_DIR_SIZE' => get_formatted_filesize($dir_sizes['stat_medium']),
'CACHE_DIR_SIZE' => get_formatted_filesize($dir_sizes['stat_cache']),
'GALLERY_VERSION' => phpbb_gallery_config::get('version'),
- 'U_FIND_USERNAME' => phpbb_gallery_url::append_sid('phpbb', 'memberlist', 'mode=searchuser&amp;form=action_create_pega&amp;field=username&amp;select_single=true'),
+ 'U_FIND_USERNAME' => phpbb_gallery_url::append_sid('phpbb', 'memberlist', 'mode=searchuser&amp;form=action_create_pega_form&amp;field=username&amp;select_single=true'),
'S_SELECT_ALBUM' => phpbb_gallery_album::get_albumbox(false, 'reset_album_id', false, false, false, phpbb_gallery_album::PUBLIC_ALBUM, phpbb_gallery_album::TYPE_UPLOAD),
'S_FOUNDER' => ($user->data['user_type'] == USER_FOUNDER) ? true : false,
+ 'U_ACTION' => $this->u_action,
));
}
View
2  root/includes/acp/acp_gallery_albums.php
@@ -398,7 +398,7 @@ function main($id, $mode)
$album_sort_key_options .= '<option' . ((!in_array($album_data['album_sort_key'], array('t', 'n', 'vc', 'u', 'ra', 'r', 'c', 'lc'))) ? ' selected="selected"' : '') . " value=''>" . $user->lang['SORT_DEFAULT'] . '</option>';
$album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 't') ? ' selected="selected"' : '') . " value='t'>" . $user->lang['TIME'] . '</option>';
$album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 'n') ? ' selected="selected"' : '') . " value='n'>" . $user->lang['IMAGE_NAME'] . '</option>';
- $album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 'vc') ? ' selected="selected"' : '') . " value='vc'>" . $user->lang['VIEWS'] . '</option>';
+ $album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 'vc') ? ' selected="selected"' : '') . " value='vc'>" . $user->lang['GALLERY_VIEWS'] . '</option>';
$album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 'u') ? ' selected="selected"' : '') . " value='u'>" . $user->lang['USERNAME'] . '</option>';
$album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 'ra') ? ' selected="selected"' : '') . " value='ra'>" . $user->lang['RATING'] . '</option>';
$album_sort_key_options .= '<option' . (($album_data['album_sort_key'] == 'r') ? ' selected="selected"' : '') . " value='r'>" . $user->lang['RATES_COUNT'] . '</option>';
View
2  root/includes/acp/acp_gallery_config.php
@@ -240,7 +240,7 @@ function sort_method_select($value, $key)
$sort_method_options .= '<option' . (($value == 't') ? ' selected="selected"' : '') . " value='t'>" . $user->lang['TIME'] . '</option>';
$sort_method_options .= '<option' . (($value == 'n') ? ' selected="selected"' : '') . " value='n'>" . $user->lang['IMAGE_NAME'] . '</option>';
- $sort_method_options .= '<option' . (($value == 'vc') ? ' selected="selected"' : '') . " value='vc'>" . $user->lang['VIEWS'] . '</option>';
+ $sort_method_options .= '<option' . (($value == 'vc') ? ' selected="selected"' : '') . " value='vc'>" . $user->lang['GALLERY_VIEWS'] . '</option>';
$sort_method_options .= '<option' . (($value == 'u') ? ' selected="selected"' : '') . " value='u'>" . $user->lang['USERNAME'] . '</option>';
$sort_method_options .= '<option' . (($value == 'ra') ? ' selected="selected"' : '') . " value='ra'>" . $user->lang['RATING'] . '</option>';
$sort_method_options .= '<option' . (($value == 'r') ? ' selected="selected"' : '') . " value='r'>" . $user->lang['RATES_COUNT'] . '</option>';
View
2  root/includes/gallery/album.php
@@ -682,7 +682,7 @@ static public function display_albums($root_data = '', $display_moderators = tru
$limit = phpbb_gallery_config::get('pegas_per_page');
$template->assign_vars(array(
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('index', 'mode=' . $mode . (($first_char) ? '&amp;first_char=' . $first_char : '')), $num_pegas, $limit, $start),
- 'TOTAL_PGALLERIES_SHORT' => sprintf($user->lang['TOTAL_PGALLERIES_SHORT'], $num_pegas),
+ 'TOTAL_PGALLERIES_SHORT' => $user->lang('TOTAL_PEGAS_SHORT_SPRINTF', $num_pegas),
'PAGE_NUMBER' => on_page($num_pegas, $limit, $start),
));
}
View
8 root/includes/gallery/feed.php
@@ -153,9 +153,9 @@ public function send_images()
foreach ($this->images_data as $image_id => $row)
{
- $u_thumbnail = phpbb_gallery_url::append_sid('full', 'image', 'mode=thumbnail&amp;album_id=' . $row['image_album_id'] . '&amp;image_id=' . $image_id);
- $url_imagepage = phpbb_gallery_url::append_sid('full', 'image_page', 'album_id=' . $row['image_album_id'] . '&amp;image_id=' . $image_id);
- $url_fullsize = phpbb_gallery_url::append_sid('full', 'image', 'album_id=' . $row['image_album_id'] . '&amp;image_id=' . $image_id);
+ $u_thumbnail = phpbb_gallery_url::append_sid('full', 'image', 'mode=thumbnail&amp;album_id=' . $row['image_album_id'] . '&amp;image_id=' . $image_id, true, '');
+ $url_imagepage = phpbb_gallery_url::append_sid('full', 'image_page', 'album_id=' . $row['image_album_id'] . '&amp;image_id=' . $image_id, true, '');
+ $url_fullsize = phpbb_gallery_url::append_sid('full', 'image', 'album_id=' . $row['image_album_id'] . '&amp;image_id=' . $image_id, true, '');
$title = censor_text($row['album_name'] . ' ' . $this->separator . ' ' . $row['image_name']);
$description = $row['image_desc'];
@@ -177,7 +177,7 @@ public function send_images()
}
else
{
- $u_profile = phpbb_gallery_url::append_sid('board', 'memberlist', 'mode=viewprofile&amp;u=' . $row['image_user_id']);
+ $u_profile = phpbb_gallery_url::append_sid('board', 'memberlist', 'mode=viewprofile&amp;u=' . $row['image_user_id'], true, '');
$image_username = '<a href="' . $u_profile . '">' . $row['image_username'] . '</a>';
}
View
13 root/includes/gallery/image/file.php
@@ -365,6 +365,8 @@ public function create_thumbnail($max_width, $max_height, $print_details = false
$dimension_width = imagefontwidth($dimension_font) * strlen($dimension_string);
$dimension_x = ($this->image_size['width'] - $dimension_width) / 2;
$dimension_y = $this->image_size['height'] + (($additional_height - $dimension_height) / 2);
+ $black_background = imagecolorallocate($this->image, 0, 0, 0);
+ imagefilledrectangle($this->image, 0, $this->thumb_height, $this->thumb_width, $this->thumb_height + $additional_height, $black_background);
imagestring($this->image, 1, $dimension_x, $dimension_y, $dimension_string, $dimension_colour);
}
}
@@ -394,10 +396,13 @@ public function resize_image($max_width, $max_height, $additional_height = 0)
}
$image_copy = (($this->gd_version == phpbb_gallery_constants::GDLIB1) ? @imagecreate($this->thumb_width, $this->thumb_height + $additional_height) : @imagecreatetruecolor($this->thumb_width, $this->thumb_height + $additional_height));
- imagealphablending($image_copy, false);
- imagesavealpha($image_copy, true);
- $transparent = imagecolorallocatealpha($image_copy, 255, 255, 255, 127);
- imagefilledrectangle($image_copy, 0, 0, $this->thumb_width, $this->thumb_height + $additional_height, $transparent);
+ if ($this->image_type != 'jpeg')
+ {
+ imagealphablending($image_copy, false);
+ imagesavealpha($image_copy, true);
+ $transparent = imagecolorallocatealpha($image_copy, 255, 255, 255, 127);
+ imagefilledrectangle($image_copy, 0, 0, $this->thumb_width, $this->thumb_height + $additional_height, $transparent);
+ }
$resize_function = ($this->gd_version == phpbb_gallery_constants::GDLIB1) ? 'imagecopyresized' : 'imagecopyresampled';
$resize_function($image_copy, $this->image, 0, 0, 0, 0, $this->thumb_width, $this->thumb_height, $this->image_size['width'], $this->image_size['height']);
View
6 root/includes/gallery/integration.php
@@ -121,7 +121,7 @@ static public function posting_display_popup()
// Initial load of some needed stuff, like permissions, album data, ...
phpbb_gallery::init();
- $user->add_lang('mods/gallery');
+ $user->add_lang(array('mods/info_acp_gallery', 'mods/gallery'));
$template->assign_vars(array(
'S_GALLERY_POPUP' => true,
@@ -222,7 +222,7 @@ static public function cache()
FROM ' . GALLERY_ALBUMS_TABLE . ' a
LEFT JOIN ' . USERS_TABLE . ' u
ON (u.user_id = a.album_user_id)
- ORDER BY u.username_clean, a.left_id ASC';
+ ORDER BY u.username_clean, a.album_user_id, a.left_id ASC';
$result = $db->sql_query($sql);
$albums = array();
@@ -443,7 +443,7 @@ static public function ucp_pm_viewmessage($id, $mode, $folder_id, $msg_id, $fold
'GALLERY_IMG' => $user->img('icon_contact_gallery', 'PERSONAL_ALBUM'),
'U_GALLERY' => (phpbb_gallery_config::get('viewtopic_icon') && $row['personal_album_id']) ? phpbb_gallery_url::append_sid('album', "album_id=" . $row['personal_album_id']) : '',
'GALLERY_IMAGES' => (phpbb_gallery_config::get('viewtopic_images')) ? $row['user_images'] : 0,
- 'U_GALLERY_SEARCH' => (phpbb_gallery_config::get('viewtopic_images') && phpbb_gallery_config::get('viewtopic_link') && $row['user_images']) ? phpbb_gallery_url::append_sid('search', "user_id=$poster_id") : '',
+ 'U_GALLERY_SEARCH' => (phpbb_gallery_config::get('viewtopic_images') && phpbb_gallery_config::get('viewtopic_link') && $row['user_images']) ? phpbb_gallery_url::append_sid('search', 'user_id=' . (int) $message_row['author_id']) : '',
));
}
}
View
6 root/includes/gallery/mcp.php
@@ -175,7 +175,7 @@ static public function album($mode, $album_id, $album_data)
'NO_IMAGES_NOTE' => $user->lang['NO_IMAGES'],
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('mcp', "mode=$mode&amp;album_id=$album_id&amp;sd=$sort_dir&amp;sk=$sort_key"), $count_images, $images_per_page, $start),
'PAGE_NUMBER' => on_page($count_images, $images_per_page, $start),
- 'TOTAL_IMAGES' => ($count_images == 1) ? $user->lang['VIEW_ALBUM_IMAGE'] : sprintf($user->lang['VIEW_ALBUM_IMAGES'], $count_images),
+ 'TOTAL_IMAGES' => $user->lang('VIEW_ALBUM_IMAGES', $count_images),
'S_COMMENTS' => phpbb_gallery_config::get('allow_comments'),
'S_RATINGS' => phpbb_gallery_config::get('allow_rates'),
@@ -353,7 +353,7 @@ static public function queue($mode, $album_id, $album_data)
'DESCRIPTION' => $desc_string,
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('mcp', "mode=$mode&amp;album_id=$album_id&amp;sd=$sort_dir&amp;sk=$sort_key"), $count_images, $images_per_page, $start),
'PAGE_NUMBER' => on_page($count_images, $images_per_page, $start),
- 'TOTAL_IMAGES' => ($count_images == 1) ? $user->lang['VIEW_ALBUM_IMAGE'] : sprintf($user->lang['VIEW_ALBUM_IMAGES'], $count_images),
+ 'TOTAL_IMAGES' => $user->lang('VIEW_ALBUM_IMAGES', $count_images),
'S_QUEUE_LIST' => true,
'S_MARK' => true,
@@ -485,7 +485,7 @@ static public function report($mode, $album_id, $album_data)
'DESCRIPTION' => $desc_string,
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('mcp', "mode=$mode&amp;album_id=$album_id&amp;sd=$sort_dir&amp;sk=$sort_key"), $count_images, $images_per_page, $start),
'PAGE_NUMBER' => on_page($count_images, $images_per_page, $start),
- 'TOTAL_IMAGES' => ($count_images == 1) ? $user->lang['VIEW_ALBUM_IMAGE'] : sprintf($user->lang['VIEW_ALBUM_IMAGES'], $count_images),
+ 'TOTAL_IMAGES' => $user->lang('VIEW_ALBUM_IMAGES', $count_images),
'S_REPORT_LIST' => true,
'S_REPORTER' => true,
View
4 root/includes/gallery/upload.php
@@ -141,7 +141,7 @@ public function upload_zip()
$this->read_zip_folder($tmp_dir);
- // Readd zip from allowed extensions
+ // Read zip from allowed extensions
$this->upload->set_allowed_extensions(self::get_allowed_types());
}
@@ -158,7 +158,7 @@ public function read_zip_folder($current_dir)
{
$this->read_zip_folder($current_dir . $file . '/');
}
- else if (in_array(utf8_substr(strtolower($file), utf8_strpos($file, '.') + 1), self::get_allowed_types(false, true)))
+ else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
{
if (!$this->file_limit || ($this->uploaded_files < $this->file_limit))
{
View
4 root/includes/ucp/ucp_gallery.php
@@ -1056,7 +1056,7 @@ function manage_subscriptions()
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('phpbb', 'ucp', 'i=gallery&amp;mode=manage_subscriptions'), $total_images, $images_per_page, $start),
'PAGE_NUMBER' => on_page($total_images, $images_per_page, $start),
- 'TOTAL_IMAGES' => ($total_images == 1) ? $user->lang['VIEW_ALBUM_IMAGE'] : sprintf($user->lang['VIEW_ALBUM_IMAGES'], $total_images),
+ 'TOTAL_IMAGES' => $user->lang('VIEW_ALBUM_IMAGES', $total_images),
'DISP_FAKE_THUMB' => true,
'FAKE_THUMB_SIZE' => phpbb_gallery_config::get('mini_thumbnail_size'),
@@ -1131,7 +1131,7 @@ function manage_favorites()
'PAGINATION' => generate_pagination(phpbb_gallery_url::append_sid('phpbb', 'ucp', 'i=gallery&amp;mode=manage_favorites'), $total_images, $images_per_page, $start),
'PAGE_NUMBER' => on_page($total_images, $images_per_page, $start),
- 'TOTAL_IMAGES' => ($total_images == 1) ? $user->lang['VIEW_ALBUM_IMAGE'] : sprintf($user->lang['VIEW_ALBUM_IMAGES'], $total_images),
+ 'TOTAL_IMAGES' => $user->lang('VIEW_ALBUM_IMAGES', $total_images),
'DISP_FAKE_THUMB' => true,
'FAKE_THUMB_SIZE' => phpbb_gallery_config::get('mini_thumbnail_size'),
View
2  root/install/index.php
@@ -20,7 +20,7 @@
define('REQUIRED_PHP_VERSION', '5.0');
define('REQUIRED_PHPBB_VERSION', '3.0.9');
-define('NEWEST_PG_VERSION', '1.1.5');//@todo
+define('NEWEST_PG_VERSION', '1.1.6');//@todo
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
View
2  root/install/install_convert_ts.php
@@ -302,6 +302,7 @@ function copy_schema($mode, $sub)
$this->page_title = $user->lang['STAGE_COPY_TABLE'];
$s_hidden_fields = '';
+ $umil = new umil(true);
// Create the tables
$umil->table_add(array(
@@ -403,6 +404,7 @@ function load_schema($mode, $sub)
$this->page_title = $user->lang['STAGE_CREATE_TABLE'];
$s_hidden_fields = '';
+ $umil = new umil(true);
// Create the tables
$umil->table_add(array(
View
33 root/language/de/mods/gallery.php
@@ -132,9 +132,10 @@
'FILETYPES_PNG' => 'png',
'FILETYPES_ZIP' => 'zip',
+ 'GALLERY_IMAGE' => 'Bild',
+ 'GALLERY_VIEWS' => 'Betrachtet',
+
'IGNORE_NOTUPTODATE_MESSAGE' => 'In 7 Tagen wieder erinnern',
- 'IMAGE' => 'Bild',
- 'IMAGE_#' => '1 Bild',
'IMAGE_ALREADY_REPORTED' => 'Das Bild wurde bereits gemeldet.',
'IMAGE_BBCODE' => 'BBCode',
'IMAGE_COMMENTS_DISABLED' => 'Kommentare wurden für dieses Bild deaktiviert.',
@@ -149,7 +150,6 @@
'IMAGE_STATUS' => 'Status',
'IMAGE_URL' => 'Bildlink',
'IMAGE_WIDTH' => 'Bildbreite',
- 'IMAGES_#' => '%s Bilder',
'IMAGES_REPORTED_SUCCESSFULLY' => 'Das Bild wurde erfolgreich gemeldet',
'IMAGES_UPDATED_SUCCESSFULLY' => 'Deine Bilderinformationen wurden erfolgreich aktualisiert',
'INSERT_IMAGE_POST' => 'Bild in Beitrag einfügen',
@@ -258,12 +258,22 @@
'SUBALBUM' => 'Subalbum',
'THUMBNAIL_SIZE' => 'Vorschaubildgrösse (Pixel)',
- 'TOTAL_COMMENTS_OTHER' => 'Kommentare insgesamt: <strong>%d</strong>',
- 'TOTAL_COMMENTS_ZERO' => 'Kommentare insgesamt: <strong>0</strong>',
+ 'TOTAL_COMMENTS_SPRINTF' => array(
+ 0 => 'Kommentare insgesamt: <strong>0</strong>',
+ 1 => 'Kommentare insgesamt: <strong>%d</strong>',
+ 2 => 'Kommentare insgesamt: <strong>%d</strong>',
+ ),
'TOTAL_IMAGES' => 'Bilder insgesamt',
- 'TOTAL_PGALLERIES_OTHER' => 'Persönliche Galerien insgesamt: <strong>%d</strong>',
- 'TOTAL_PGALLERIES_SHORT' => '%d persönliche Galerien',
- 'TOTAL_PGALLERIES_ZERO' => 'Persönliche Galerien insgesamt: <strong>0</strong>',
+ 'TOTAL_PEGAS_SHORT_SPRINTF' => array(
+ 0 => '0 persönliche Galerien',
+ 1 => '%d persönliche Galerie',
+ 2 => '%d persönliche Galerien',
+ ),
+ 'TOTAL_PEGAS_SPRINTF' => array(
+ 0 => 'Persönliche Galerien insgesamt: <strong>0</strong>',
+ 1 => 'Persönliche Galerien insgesamt: <strong>%d</strong>',
+ 2 => 'Persönliche Galerien insgesamt: <strong>%d</strong>',
+ ),
'UNFAVORITE_IMAGE' => 'aus Lieblingsbildern entfernen',
'UNFAVORITED_IMAGE' => 'Das Bild wurde aus deinen Lieblingsbildern entfernt.',
@@ -299,8 +309,10 @@
'USERS_PERSONAL_ALBUMS' => 'Persönliche Alben der Mitglieder',
'VIEW_ALBUM' => 'Album ansehen',
- 'VIEW_ALBUM_IMAGE' => '1 Bild',
- 'VIEW_ALBUM_IMAGES' => '%s Bilder',
+ 'VIEW_ALBUM_IMAGES' => array(
+ 1 => '1 Bild',
+ 2 => '%s Bilder',
+ ),
'VIEW_IMAGE' => 'Bild ansehen',
'VIEW_LATEST_IMAGE' => 'Das neueste Bild ansehen',
'VIEW_SEARCH_RECENT' => 'Neueste Bilder',
@@ -311,7 +323,6 @@
'VIEW_SEARCH_SELF' => 'Eigene Bilder',
'VIEWING_ALBUM' => 'Betrachtet Album %s',
'VIEWING_IMAGE' => 'Betrachtet ein Bild im Album %s',
- 'VIEWS' => 'Betrachtet',
'WATCH_ALBUM' => 'Album beobachten',
'WATCH_IMAGE' => 'Bild beobachten',
View
2  root/language/de/mods/gallery_acp.php
@@ -256,6 +256,8 @@
'NUMBER_PERSONALS' => 'Anzahl von Persönlichen Alben',
'OWN_PERSONAL_ALBUMS' => 'Eigene persönliche Alben',
+ 'OWN_PERSONAL_ALBUMS_EXPLAIN' => 'Diese Berechtigungen werden verwendet, wenn Benutzer A eines seiner eigenen Alben betrachtet. <strong>Wenn deine Benutzer keine persönlichen Alben erstellen können, musst du diese Berechtigungen bearbeiten.</strong>',
+ 'PERSONAL_ALBUMS_EXPLAIN' => 'Diese Berechtigungen werden verwendet, wenn Benutzer A ein persönliches Album von Benutzer B betrachtet. <strong>Wenn deine Moderatoren keine Bilder in den persönlichen Alben bearbeiten können, musst du diese Berechtigungen bearbeiten.</strong>',
'PERMISSION' => 'Berechtigung',
'PERMISSION_NEVER' => 'Nie',
View
33 root/language/en/mods/gallery.php
@@ -132,9 +132,10 @@
'FILETYPES_PNG' => 'png',
'FILETYPES_ZIP' => 'zip',
+ 'GALLERY_IMAGE' => 'Image',
+ 'GALLERY_VIEWS' => 'Views',
+
'IGNORE_NOTUPTODATE_MESSAGE' => 'Remind me in 7 days',
- 'IMAGE' => 'Image',
- 'IMAGE_#' => '1 image',
'IMAGE_ALREADY_REPORTED' => 'The image was already reported.',
'IMAGE_BBCODE' => 'Image BBCode',
'IMAGE_COMMENTS_DISABLED' => 'Comments are disabled for this image.',
@@ -149,7 +150,6 @@
'IMAGE_STATUS' => 'Status',
'IMAGE_URL' => 'Image-URL',
'IMAGE_WIDTH' => 'Image width',
- 'IMAGES_#' => '%s images',
'IMAGES_REPORTED_SUCCESSFULLY' => 'The image was successful reported',
'IMAGES_UPDATED_SUCCESSFULLY' => 'Your image information has been updated successfully',
'INSERT_IMAGE_POST' => 'Insert image into post',
@@ -258,12 +258,22 @@
'SUBALBUM' => 'Subalbum',
'THUMBNAIL_SIZE' => 'Thumbnail size (pixels)',
- 'TOTAL_COMMENTS_OTHER' => 'Total comments <strong>%d</strong>',
- 'TOTAL_COMMENTS_ZERO' => 'Total comments <strong>0</strong>',
+ 'TOTAL_COMMENTS_SPRINTF' => array(
+ 0 => 'Total comments <strong>0</strong>',
+ 1 => 'Total comments <strong>%d</strong>',
+ 2 => 'Total comments <strong>%d</strong>',
+ ),
'TOTAL_IMAGES' => 'Total images',
- 'TOTAL_PGALLERIES_OTHER' => 'Total personal galleries <strong>%d</strong>',
- 'TOTAL_PGALLERIES_SHORT' => '%d personal galleries ',
- 'TOTAL_PGALLERIES_ZERO' => 'Total personal galleries <strong>0</strong>',
+ 'TOTAL_PEGAS_SHORT_SPRINTF' => array(
+ 0 => '0 personal galleries',
+ 1 => '%d personal gallery',
+ 2 => '%d personal galleries',
+ ),
+ 'TOTAL_PEGAS_SPRINTF' => array(
+ 0 => 'Total personal galleries <strong>0</strong>',
+ 1 => 'Total personal galleries <strong>%d</strong>',
+ 2 => 'Total personal galleries <strong>%d</strong>',
+ ),
'UNFAVORITE_IMAGE' => 'Remove from favorites',
'UNFAVORITED_IMAGE' => 'The image was removed from your favorites.',
@@ -299,8 +309,10 @@
'USERS_PERSONAL_ALBUMS' => 'Users Personal Albums',
'VIEW_ALBUM' => 'View album',
- 'VIEW_ALBUM_IMAGE' => '1 image',
- 'VIEW_ALBUM_IMAGES' => '%s images',
+ 'VIEW_ALBUM_IMAGES' => array(
+ 1 => '1 image',
+ 2 => '%s images',
+ ),
'VIEW_IMAGE' => 'View image',
'VIEW_LATEST_IMAGE' => 'View the latest image',
'VIEW_SEARCH_RECENT' => 'View recent images',
@@ -311,7 +323,6 @@
'VIEW_SEARCH_SELF' => 'View your images',
'VIEWING_ALBUM' => 'Viewing album %s',
'VIEWING_IMAGE' => 'Viewing image in album %s',
- 'VIEWS' => 'Views',
'WATCH_ALBUM' => 'Subscribe album',
'WATCH_IMAGE' => 'Subscribe image',
View
2  root/language/en/mods/gallery_acp.php
@@ -254,6 +254,8 @@
'NUMBER_PERSONALS' => 'Number of personal albums',
'OWN_PERSONAL_ALBUMS' => 'Own personal albums',
+ 'OWN_PERSONAL_ALBUMS_EXPLAIN' => 'These permissions are used, when User A visits one of his own personal albums. <strong>If your users can not create a personal album, you need to edit these permissions.</strong>',
+ 'PERSONAL_ALBUMS_EXPLAIN' => 'These permissions are used, when User A visits a personal album of User B. <strong>If your moderators can not moderate images in personal albums, you need to edit these permissions.</strong>',
'PERMISSION' => 'Permission',
'PERMISSION_NEVER' => 'Never',
View
2  root/styles/prosilver/template/gallery/imageblock_body.html
@@ -30,7 +30,7 @@
<!-- IF imageblock.imagerow.image.U_ALBUM -->{L_ALBUM_NAME}: <a href="{imageblock.imagerow.image.U_ALBUM}" style="font-weight: bold;" title="{imageblock.imagerow.image.ALBUM_NAME_FULL}">{imageblock.imagerow.image.ALBUM_NAME}</a><br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.POSTER -->{L_UPLOADED_BY_USER}: {imageblock.imagerow.image.POSTER}<br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.TIME -->{L_UPLOADED_ON_DATE}: {imageblock.imagerow.image.TIME}<br /><!-- ENDIF -->
- <!-- IF imageblock.imagerow.image.VIEW > -1 -->{L_VIEWS}: {imageblock.imagerow.image.VIEW}<br /><!-- ENDIF -->
+ <!-- IF imageblock.imagerow.image.VIEW > -1 -->{L_GALLERY_VIEWS}: {imageblock.imagerow.image.VIEW}<br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.S_RATINGS -->{L_RATING}: <a href="{imageblock.imagerow.image.U_RATINGS}">{imageblock.imagerow.image.S_RATINGS}</a><br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.S_COMMENTS -->{imageblock.imagerow.image.L_COMMENTS}: <a href="{imageblock.imagerow.image.U_COMMENTS}">{imageblock.imagerow.image.S_COMMENTS}</a><br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.S_IP -->{L_IP}: {imageblock.imagerow.image.S_IP} &#187; <a href="{imageblock.imagerow.image.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a><br /><!-- ENDIF -->
View
2  root/styles/prosilver/template/gallery/mcp_body.html
@@ -91,7 +91,7 @@
<option<!-- IF S_SORT_KEY == 'image_name' --> selected="selected"<!-- ENDIF --> value='image_name'>{L_IMAGE_NAME}</option>
<option<!-- IF S_SORT_KEY == 'image_username' --> selected="selected"<!-- ENDIF --> value='image_username'>{L_SORT_USERNAME}</option>
<!-- IF not S_REPORT_LIST or S_QUEUE_LIST -->
- <option<!-- IF S_SORT_KEY == 'image_view_count' --> selected="selected"<!-- ENDIF --> value='image_view_count'>{L_VIEWS}</option>
+ <option<!-- IF S_SORT_KEY == 'image_view_count' --> selected="selected"<!-- ENDIF --> value='image_view_count'>{L_GALLERY_VIEWS}</option>
<!-- ENDIF -->
<!-- IF S_REPORT_LIST -->
<option<!-- IF S_SORT_KEY == 'reporter_name' --> selected="selected"<!-- ENDIF --> value='reporter_name'>{L_REPORTER}</option>
View
2  root/styles/prosilver/template/gallery/viewimage_body.html
@@ -45,7 +45,7 @@
</dl>
<!-- ENDIF -->
<dl class="column2">
- <dt><label>{L_VIEWS}:</label></dt>
+ <dt><label>{L_GALLERY_VIEWS}:</label></dt>
<dd>{IMAGE_VIEW}</dd>
</dl>
<!-- IF IMAGE_BBCODE -->
View
2  root/styles/subsilver2/template/gallery/imageblock_body.html
@@ -35,7 +35,7 @@
<!-- IF imageblock.imagerow.image.U_ALBUM -->{L_ALBUM_NAME}: <a href="{imageblock.imagerow.image.U_ALBUM}" style="font-weight: bold;" title="{imageblock.imagerow.image.ALBUM_NAME_FULL}">{imageblock.imagerow.image.ALBUM_NAME}</a><br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.POSTER -->{L_UPLOADED_BY_USER}: {imageblock.imagerow.image.POSTER}<br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.TIME -->{L_UPLOADED_ON_DATE}: {imageblock.imagerow.image.TIME}<br /><!-- ENDIF -->
- <!-- IF imageblock.imagerow.image.VIEW > -1 -->{L_VIEWS}: {imageblock.imagerow.image.VIEW}<br /><!-- ENDIF -->
+ <!-- IF imageblock.imagerow.image.VIEW > -1 -->{L_GALLERY_VIEWS}: {imageblock.imagerow.image.VIEW}<br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.S_RATINGS -->{L_RATING}: <a href="{imageblock.imagerow.image.U_RATINGS}">{imageblock.imagerow.image.S_RATINGS}</a><br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.S_COMMENTS -->{imageblock.imagerow.image.L_COMMENTS}: <a href="{imageblock.imagerow.image.U_COMMENTS}">{imageblock.imagerow.image.S_COMMENTS}</a><br /><!-- ENDIF -->
<!-- IF imageblock.imagerow.image.S_IP -->{L_IP}: {imageblock.imagerow.image.S_IP} &#187; <a href="{imageblock.imagerow.image.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a><br /><!-- ENDIF -->
View
2  root/styles/subsilver2/template/gallery/mcp_body.html
@@ -56,7 +56,7 @@
<option<!-- IF S_SORT_KEY == 'image_name' --> selected="selected"<!-- ENDIF --> value='image_name'>{L_IMAGE_NAME}</option>
<option<!-- IF S_SORT_KEY == 'image_username' --> selected="selected"<!-- ENDIF --> value='image_username'>{L_SORT_USERNAME}</option>
<!-- IF not S_REPORT_LIST or S_QUEUE_LIST -->
- <option<!-- IF S_SORT_KEY == 'image_view_count' --> selected="selected"<!-- ENDIF --> value='image_view_count'>{L_VIEWS}</option>
+ <option<!-- IF S_SORT_KEY == 'image_view_count' --> selected="selected"<!-- ENDIF --> value='image_view_count'>{L_GALLERY_VIEWS}</option>
<!-- ENDIF -->
<!-- IF S_REPORT_LIST -->
<option<!-- IF S_SORT_KEY == 'reporter_name' --> selected="selected"<!-- ENDIF --> value='reporter_name'>{L_REPORTER}</option>
View
2  root/styles/subsilver2/template/gallery/viewimage_body.html
@@ -75,7 +75,7 @@
<td><span class="genmed">{IMAGE_TIME}</span></td>
</tr>
<tr class="row1">
- <td width="25%" align="right"><span class="genmed">{L_VIEWS}:</span></td>
+ <td width="25%" align="right"><span class="genmed">{L_GALLERY_VIEWS}:</span></td>
<td><span class="genmed">{IMAGE_VIEW}</span></td>
</tr>
<!-- IF S_VIEW_RATE -->

No commit comments for this range

Something went wrong with that request. Please try again.