Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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.
base: 0194628a65
...
compare: 8d72c950e6
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 8 files changed
  • 0 commit comments
  • 2 contributors
Commits on Oct 10, 2011
@VSEphpbb VSEphpbb Bug Fix new Bbvideo updater - add return message, put multiple custom…
… functions in an array
608ca99
@VSEphpbb VSEphpbb Tidy up installer: Remove $mod_data array (redundant) and remove Inst…
…all complete message
2c447a0
Commits on Oct 11, 2011
@VSEphpbb VSEphpbb Tidy up some of the language inside the Warning in the Installer a0e4e8d
@VSEphpbb VSEphpbb Spelling fixes
1) Change Advanced BBCodes Box to Advanced BBCode Box (BBCode should
not be plural)
2) ACP - Page title for editing ABBC3 BBcodes should be "ABBC3 BBCodes"
(used to say Advanced BBCode Box 3)
3) ACP - Page title for ABBC3 settings should be "ABBC3 Settings" (used
to say ABBC3 settings)
5e36be1
@mssti Merge pull request #69 from VSEphpbb/3.0.10-dev
Some more installer tweaks
8d72c95
View
7 mssti_abbc3/contrib/update_MSSTI_ABBC3_v308-PL1_to_v3010.xml
@@ -178,6 +178,13 @@
</open>
+ <open src="language/en/acp/common.php">
+ <edit>
+ <find><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcodes Box 3',]]></find>
+ <action type="replace-with"><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcode Box 3',]]></action>
+ </edit>
+ </open>
+
<diy-instructions lang="en"><![CDATA[You can delete the ibox folder located at root/styles/abbcode/ibox/]]></diy-instructions>
</action-group>
View
7 mssti_abbc3/contrib/update_MSSTI_ABBC3_v308-PL2_to_v3010.xml
@@ -173,6 +173,13 @@
</open>
+ <open src="language/en/acp/common.php">
+ <edit>
+ <find><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcodes Box 3',]]></find>
+ <action type="replace-with"><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcode Box 3',]]></action>
+ </edit>
+ </open>
+
<diy-instructions lang="en"><![CDATA[You can delete the ibox folder located at root/styles/abbcode/ibox/]]></diy-instructions>
</action-group>
View
7 mssti_abbc3/contrib/update_MSSTI_ABBC3_v308_to_v3010.xml
@@ -271,6 +271,13 @@
</open>
+ <open src="language/en/acp/common.php">
+ <edit>
+ <find><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcodes Box 3',]]></find>
+ <action type="replace-with"><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcode Box 3',]]></action>
+ </edit>
+ </open>
+
<open src="styles/prosilver/template/overall_header.html">
<edit>
<find><![CDATA[<!-- INCLUDE {S_ABBC3_OVERALL_HEADER} -->]]></find>
View
7 mssti_abbc3/contrib/update_MSSTI_ABBC3_v3093_to_v3010.xml
@@ -105,5 +105,12 @@
</open>
+ <open src="language/en/acp/common.php">
+ <edit>
+ <find><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcodes Box 3',]]></find>
+ <action type="replace-with"><![CDATA[ 'ACP_ABBCODES' => 'Advanced BBcode Box 3',]]></action>
+ </edit>
+ </open>
+
</action-group>
</mod>
View
2  mssti_abbc3/install_ABBC3.xml
@@ -696,7 +696,7 @@ define('CLICKS_TABLE', $table_prefix . 'clicks');
<find><![CDATA[?>]]></find>
<action type="before-add"><![CDATA[// MOD : MSSTI ABBC3 - Start
$lang = array_merge($lang, array(
- 'ACP_ABBCODES' => 'Advanced BBcodes Box 3',
+ 'ACP_ABBCODES' => 'Advanced BBcode Box 3',
'ACP_ABBC3_SETTINGS' => 'ABBC3 Settings',
'ACP_ABBC3_BBCODES' => 'ABBC3 BBCodes',
'LOG_CONFIG_ABBCODES' => '<strong>Altered ABBC3 settings</strong>',
View
2  mssti_abbc3/root/includes/acp/acp_abbcodes.php
@@ -77,7 +77,7 @@ function main($id, $mode)
$bbcode_id = request_var('bbcode_id', 0);
$this->tpl_name = 'acp_abbcodes';
- $this->page_title = 'ACP_ABBCODES';
+ $this->page_title = 'ACP_ABBC3_BBCODES';
$form_key = 'acp_abbcodes';
add_form_key($form_key);
View
40 mssti_abbc3/root/install_abbc3.php
@@ -33,25 +33,19 @@
trigger_error('Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/" onclick="window.open(this.href);return false;">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
-/** Set some default values so the user havn't to run any install - Start **/
-$mod_data = array(
- 'config' => 'ABBC3_VERSION',
- 'name' => 'INSTALLER_TITLE',
- 'language' => array('mods/acp_abbcodes', 'mods/abbcode', 'posting', 'install')
-);
-/** Set some default values so the user havn't to run any install - End **/
-
// The name of the mod to be displayed during installation.
-$mod_name = $mod_data['name'];
+$mod_name = 'INSTALLER_TITLE';
-// The name of the config variable which will hold the currently installed version
-$version_config_name = $mod_data['config'];
+/*
+* The name of the config variable which will hold the currently installed version
+* UMIL will handle checking, setting, and updating the version itself.
+*/
+$version_config_name = 'ABBC3_VERSION';
-// Add the language file if one was specified
-if (isset($mod_data['language']))
-{
- $user->add_lang($mod_data['language']);
-}
+/*
+* The language file which will be included when installing
+*/
+$user->add_lang(array('mods/acp_abbcodes', 'mods/abbcode', 'posting', 'install'));
// Logo Image
$logo_img = $phpbb_root_path . 'styles/abbcode/abbc3_logo.png';
@@ -107,11 +101,13 @@
// No new database changes (so far)
),
'3.0.9.3' => array(
- 'custom' => 'abbc3_309',
- 'custom' => 'bbvideo_updater',
+ 'custom' => array(
+ 'abbc3_309', //special changes for version 3.0.9
+ 'bbvideo_updater', //enable some new BBvideo IDs
+ ),
),
'3.0.10' => array(
- 'custom' => 'bbvideo_updater',
+ 'custom' => 'bbvideo_updater', //enable some new BBvideo IDs
),
);
$cache->destroy('config');
@@ -458,8 +454,6 @@ function abbc3_308($action, $version)
cache_purge();
- $message .= $user->lang['INSTALLER_INSTALL_END'];
-
// return a message
return $message;
}
@@ -718,7 +712,7 @@ function abbc3_309($action, $version)
**/
function bbvideo_updater($action, $version)
{
- global $umil;
+ global $umil, $user;
// Array containing arrays of new BBVideo IDs added to ABBC3
$new_bbvideo_ids = array(
@@ -756,6 +750,8 @@ function bbvideo_updater($action, $version)
$umil->config_update('ABBC3_VIDEO_OPTIONS', implode(';', $video_options_array) . ';');
break;
}
+
+ return $user->lang['INSTALLER_BBVIDEO_UPDATER'];
}
/**
View
23 mssti_abbc3/root/language/en/mods/acp_abbcodes.php
@@ -1,7 +1,7 @@
<?php
/**
* @package: phpBB 3.0.9 :: Advanced BBCode box 3 -> root/language/en/mods :: [en][English]
-* @version: $Id: acp_abbcode.php, v 3.0.10 9/29/11 12:07 AM VSE Exp $
+* @version: $Id: acp_abbcode.php, v 3.0.10 10/11/11 11:25 AM VSE Exp $
* @copyright: leviatan21 < info@mssti.com > (Gabriel) http://www.mssti.com/phpbb3/
* @license: http://opensource.org/licenses/gpl-license.php GNU Public License
* @author: leviatan21 - http://www.phpbb.com/community/memberlist.php?mode=viewprofile&u=345763
@@ -40,7 +40,7 @@
// This lines are the same as root/language/en/acp/common.php
$lang = array_merge($lang, array(
- 'ACP_ABBCODES' => 'Advanced BBcodes Box 3',
+ 'ACP_ABBCODES' => 'Advanced BBcode Box 3',
'ACP_ABBC3_SETTINGS' => 'ABBC3 Settings',
'ACP_ABBC3_BBCODES' => 'ABBC3 BBCodes',
'LOG_CONFIG_ABBCODES' => '<strong>Altered ABBC3 settings</strong>',
@@ -49,7 +49,7 @@
// This lines are for the UCP
$lang = array_merge($lang, array(
- 'UCP_ABBCODES' => 'Advanced BBcodes Box 3',
+ 'UCP_ABBCODES' => 'Advanced BBcode Box 3',
'UCP_ABBC3_SETTINGS' => 'Message editor BBcode interface',
'UCP_ABBC3_SETTINGS_EXPLAIN' => 'Note that in <i>Limited</i> mode, not all BBcodes will be available and must be typed in manually.',
'UCP_ABBC3_LIMITED' => 'Limited - Basic BBcodes only with no icons',
@@ -60,7 +60,7 @@
// abbc3_details
$lang = array_merge($lang, array(
'ABBCODES_DISABLE' => 'ABBC3',
- 'ABBCODES_DISABLE_EXPLAIN' => 'Enable <strong>Advanced BBcodes Box 3</strong> or disable to use standard phpBB3 BBcode buttons.',
+ 'ABBCODES_DISABLE_EXPLAIN' => 'Enable <strong>Advanced BBcode Box 3</strong> or disable to use standard phpBB3 BBcode buttons.',
// 'ABBCODES_PATH' => 'Script path',
// 'ABBCODES_PATH_EXPLAIN' => 'Path to ABBC3 files in your phpBB root directory, e.g. <samp>styles/abbcode</samp>',
'ABBCODES_BG' => 'Background image',
@@ -142,7 +142,7 @@
// bbcodes_edit
$lang = array_merge($lang, array(
- 'ABBCODES_SETINGS' => 'ABBC3 settings',
+ 'ABBCODES_SETINGS' => 'ABBC3 Settings',
'ABBCODES_SETINGS_EXPLAIN' => 'Here you can determine the basic operation of <strong>ABBC3</strong>, enable or disable, and among other settings adjust the default values for the background.',
'ABBCODES_EDIT' => 'ABBC3 edit BBcode',
@@ -165,7 +165,7 @@
'ABBCODES_SYNC' => 'Synchronise order',
'ABBCODES_RESYNC_SUCCESS' => 'The BBcode order has been resynchronised.',
- 'ABBCODES_MOD_DISABLE' => '<strong>Advanced BBcodes Box 3</strong> is disabled.<br />',
+ 'ABBCODES_MOD_DISABLE' => '<strong>Advanced BBcode Box 3</strong> is disabled.<br />',
'ABBCODES_STATUS' => 'status',
'ABBCODES_ACTIVATED' => 'activated',
'ABBCODES_DEACTIVATED' => 'deactivated',
@@ -174,19 +174,20 @@
// UMIL Installer
$lang = array_merge($lang, array(
// Main
- 'INSTALLER_TITLE' => 'Advanced BBcodes Box 3',
+ 'INSTALLER_TITLE' => 'Advanced BBcode Box 3',
'INSTALLER_TITLE_EXPLAIN' => 'Welcome to the <strong>ABBC3</strong> Installation menu',
- 'INSTALLER_INSTALL_WELCOME' => 'When you choose to install ABBC3, any database of previous versions will be dropped.',
+ 'INSTALLER_INSTALL_WELCOME' => 'Before installing ABBC3',
'INSTALLER_INSTALL_WELCOME_NOTE' => 'Please be advised that this process might overwrite existing custom BBcodes and as a result, those BBcodes might not display correctly due to the changes introduced by ABBC3’s BBcodes.
- <br />If you experience problems use the <a href="http://www.phpbb.com/support/stk/" title="" onclick="window.open(this.href);return false;">Support Toolkit <em>(STK)</em></a> <strong>Admin tools » Reparse BBCode</strong> feature.
- <br /><br />Before adding this MOD to your board, you should back up files and database first.',
- 'INSTALLER_INSTALL_END' => 'You should now <a href="./index.php">login to your board</a> and check if everything is working fine. <br />Do not forget to delete, rename or move this file! <strong><em>install_abbc3.php</em></strong>',
+ <br /><br />If you experience problems with BBcodes no longer working in exisiting posts, use the <a href="http://www.phpbb.com/support/stk/" title="" onclick="window.open(this.href);return false;">Support Toolkit <em>(STK)</em></a> <strong>Admin tools » Reparse BBCode</strong> feature.
+ <br /><br />Before adding this MOD to your board, you should backup all related files and the database before proceeding.',
+// 'INSTALLER_INSTALL_END' => 'You should now <a href="./index.php">login to your board</a> and check if everything is working fine. <br />Do not forget to delete, rename or move this file! <strong><em>install_abbc3.php</em></strong>',
// Stages
'INSTALLER_CONFIGS_ADD' => 'ABBC3 config',
'INSTALLER_BBCODES_ADD' => 'ABBC3 bbcodes',
// Misc
'INSTALLER_RESIZE_CHECK' => 'Resizer Method update check complete',
+ 'INSTALLER_BBVIDEO_UPDATER' => 'BBvideos have been updated',
));
?>

No commit comments for this range

Something went wrong with that request. Please try again.