diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | doc/To-Do-Code.md | 2 | ||||
| -rw-r--r-- | install/database.sql | 31 | ||||
| -rw-r--r-- | install/update.php | 12 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/mod_directory.js | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 |
7 files changed, 35 insertions, 18 deletions
@@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1087 ); +define ( 'DB_UPDATE_VERSION', 1088 ); define ( 'EOL', '<br />' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 2d9228e88..403f6be30 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -13,6 +13,8 @@ We need much more than this, but here are areas where developers can help. Pleas * Integrate the "open site" list with the register page +* "mixed content warning" redirector so that if your server is https (as it should be) so are all your embedded content and media links + * Write more webpage layouts * Write more webpage widgets diff --git a/install/database.sql b/install/database.sql index cb332c75b..6be73f193 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', - `account_level` int(10) unsigned NOT NULL DEFAULT 0, + `account_level` int(10) unsigned NOT NULL, PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), @@ -848,6 +848,15 @@ CREATE TABLE IF NOT EXISTS `spam` ( KEY `term` (`term`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `sys_perms` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cat` char(255) NOT NULL, + `k` char(255) NOT NULL, + `v` mediumtext NOT NULL, + `public_perm` tinyint(1) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `term` ( `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', @@ -915,7 +924,7 @@ CREATE TABLE IF NOT EXISTS `verify` ( KEY `token` (`token`), KEY `meta` (`meta`), KEY `created` (`created`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `vote` ( `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -971,7 +980,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` ( KEY `xchan` (`xchan`), KEY `cat` (`cat`), KEY `k` (`k`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xign` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -1008,6 +1017,9 @@ CREATE TABLE IF NOT EXISTS `xprof` ( `xprof_postcode` char(32) NOT NULL DEFAULT '', `xprof_country` char(255) NOT NULL DEFAULT '', `xprof_keywords` text NOT NULL, + `xprof_about` text NOT NULL, + `xprof_homepage` char(255) NOT NULL DEFAULT '', + `xprof_hometown` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`xprof_hash`), KEY `xprof_desc` (`xprof_desc`), KEY `xprof_dob` (`xprof_dob`), @@ -1018,7 +1030,8 @@ CREATE TABLE IF NOT EXISTS `xprof` ( KEY `xprof_region` (`xprof_region`), KEY `xprof_postcode` (`xprof_postcode`), KEY `xprof_country` (`xprof_country`), - KEY `xprof_age` (`xprof_age`) + KEY `xprof_age` (`xprof_age`), + KEY `xprof_hometown` (`xprof_hometown`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xtag` ( @@ -1030,12 +1043,4 @@ CREATE TABLE IF NOT EXISTS `xtag` ( KEY `xtag_term` (`xtag_term`), KEY `xtag_hash` (`xtag_hash`), KEY `xtag_flags` (`xtag_flags`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -CREATE TABLE if not exists `sys_perms` ( - `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `cat` CHAR( 255 ) NOT NULL , - `k` CHAR( 255 ) NOT NULL , - `v` MEDIUMTEXT NOT NULL, - `public_perm` TINYINT( 1 ) UNSIGNED NOT NULL -) ENGINE = MYISAM DEFAULT CHARSET = utf8"); +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index c731eab06..8e64413dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1087 ); +define( 'UPDATE_VERSION' , 1088 ); /** * @@ -957,3 +957,13 @@ ADD INDEX ( `account_level` )"); return UPDATE_FAILED; } +function update_r1087() { + $r = q("ALTER TABLE `xprof` ADD `xprof_about` TEXT NOT NULL DEFAULT '', +ADD `xprof_homepage` CHAR( 255 ) NOT NULL DEFAULT '', +ADD `xprof_hometown` CHAR( 255 ) NOT NULL DEFAULT '', +ADD INDEX ( `xprof_hometown` )"); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + diff --git a/version.inc b/version.inc index 353e8ce82..bdcfdd8ad 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-23.535 +2013-12-25.537 diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index 96a38a109..291734b4f 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -1,7 +1,7 @@ function dirdetails(hash) { $.get('dirprofile' + '?f=&hash=' + hash, function( data ) { - $.colorbox({ html: data }); + $.colorbox({ maxWidth: "50%", maxHeight: "75%", html: data }); }); } diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index cdaae67e4..c3b697776 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -11,7 +11,7 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} -<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img src="{{$photo.src}}" /></a></div> {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> |