Configuration fields for hidden channels/servers can now take up to 255 characters...

diff --git a/admin/tpl/configuration_network.tpl b/admin/tpl/configuration_network.tpl
index 76257fb12240d7a5d845f8a6525fd7384db04290..0ac5a34cf0dbfea8a7fe87c54348cc4ce99baff2 100644 (file)
--- a/admin/tpl/configuration_network.tpl
+++ b/admin/tpl/configuration_network.tpl
@@ -50,11 +50,11 @@
                </tr>
                <tr>
                        <td align="right">Servers you don't want MagIRC to show.<br />Separate with commas, example: &quot;hub.mynet.tld,hub2.mynet.tld&quot;</td>
-                       <td align="left"><input name="hide_servers" type="text" id="hide_servers" value="{$cfg->hide_servers}" size="32" maxlength="64" /></td>
+                       <td align="left"><input name="hide_servers" type="text" id="hide_servers" value="{$cfg->hide_servers}" size="32" maxlength="255" /></td>
                </tr>
                <tr>
                        <td align="right">Channels you don't want MagIRC to show.<br />Separate with commas, example: &quot;#opers,#services&quot;</td>
-                       <td align="left"><input name="hide_chans" type="text" id="hide_chans" value="{$cfg->hide_chans}" size="32" maxlength="64" /></td>
+                       <td align="left"><input name="hide_chans" type="text" id="hide_chans" value="{$cfg->hide_chans}" size="32" maxlength="255" /></td>
                </tr>
        </table>
        <button id="network-submit" type="button">Save</button>

diff --git a/lib/magirc/version.inc.php b/lib/magirc/version.inc.php
index 53a5c962e5e8b984e68c255bb868dd2b79bae3ed..3509aaa4c14f603488853f2d11ec081374777376 100644 (file)
--- a/lib/magirc/version.inc.php
+++ b/lib/magirc/version.inc.php
@@ -7,6 +7,6 @@ define('VERSION_EXTRA', '-beta');
 
 define('VERSION_FULL', sprintf('%s.%s.%s%s', VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_EXTRA));
 
-define('DB_VERSION', 9);
+define('DB_VERSION', 10);
 
 ?>
\ No newline at end of file

diff --git a/setup/lib/Setup.class.php b/setup/lib/Setup.class.php
index f177f87e9ffd32b7691d60b275e013326e2ad1c3..9f10ac9119d6629fc33dfe3c7d82f548240f0c83 100644 (file)
--- a/setup/lib/Setup.class.php
+++ b/setup/lib/Setup.class.php
@@ -213,6 +213,9 @@ class Setup {
                        if ($version < 9) {
                                $this->db->insert('magirc_config', array('parameter' => 'denora_version', 'value' => '1.4'));
                        }
+                       if ($version < 10) {
+                               $this->db->query("ALTER TABLE magirc_config CHANGE value value VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''");
+                       }
                        $this->db->update('magirc_config', array('value' => DB_VERSION), array('parameter' => 'db_version'));
                        $updated = true;
                }

diff --git a/setup/sql/schema.sql b/setup/sql/schema.sql
index 5b182eb2d570aefc40f0e4302b6e35c96abbbbf3..f0069a6ffa3c3ae8efd55d4ee42db23ab075aca5 100644 (file)
--- a/setup/sql/schema.sql
+++ b/setup/sql/schema.sql
@@ -8,7 +8,7 @@
 
 CREATE TABLE IF NOT EXISTS `magirc_config` (
   `parameter` varchar(32) NOT NULL default '',
-  `value` varchar(64) NOT NULL default '',
+  `value` varchar(255) NOT NULL default '',
   PRIMARY KEY (`parameter`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `magirc_config` (
 -- Dumping data for table `magirc_config`
 --
 
-INSERT IGNORE INTO `magirc_config` (`parameter`, `value`) VALUES ('db_version', '9'),
+INSERT IGNORE INTO `magirc_config` (`parameter`, `value`) VALUES ('db_version', '10'),
 ('net_name', 'MyNetwork'),
 ('net_url', 'http://www.mynet.tld/'),
 ('net_roundrobin', ''),