diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | database.sql | 3 | ||||
| -rw-r--r-- | index.php | 13 | ||||
| -rw-r--r-- | update.php | 7 | ||||
| -rw-r--r-- | view/en/profile.php | 2 |
5 files changed, 19 insertions, 8 deletions
@@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'BUILD_ID', 1021 ); +define ( 'BUILD_ID', 1022 ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'EOL', "<br />\r\n" ); diff --git a/database.sql b/database.sql index be0671bb1..0b322e9e0 100644 --- a/database.sql +++ b/database.sql @@ -187,6 +187,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, `deny_gid` mediumtext NOT NULL, + `private` tinyint(1) NOT NULL DEFAULT '0', `visible` tinyint(1) NOT NULL DEFAULT '0', `unseen` tinyint(1) NOT NULL DEFAULT '1', `deleted` tinyint(1) NOT NULL DEFAULT '0', @@ -319,7 +320,9 @@ CREATE TABLE IF NOT EXISTS `profile` ( CREATE TABLE IF NOT EXISTS `profile_check` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(10) unsigned NOT NULL, + `cid` int(10) unsigned NOT NULL, `dfrn_id` char(255) NOT NULL, + `sec` char(255) NOT NULL, `expire` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -12,8 +12,12 @@ $install = ((file_exists('.htconfig.php')) ? false : true); @include(".htconfig.php"); -if(isset($lang) && strlen($lang)) - load_translation_table($lang); +// get language setting directly from system variables, bypassing get_config() +// as database may not yet be configured. + +$lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en'); + +load_translation_table($lang); require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); @@ -111,7 +115,7 @@ if($a->module != 'install') // make sure the desired theme exists, though if the default theme doesn't exist we're stuffed. -if((x($_SESSION,'theme')) && (! file_exists('/view/theme/' . $_SESSION['theme'] . '/style.css'))) +if((x($_SESSION,'theme')) && (! file_exists('view/theme/' . $_SESSION['theme'] . '/style.css'))) unset($_SESSION['theme']); $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array( @@ -122,9 +126,6 @@ $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array( $page = $a->page; $profile = $a->profile; -$lang = get_config('system','language'); -if($lang === false) - $lang = 'en'; header("Content-type: text/html; charset=utf-8"); diff --git a/update.php b/update.php index b1950e588..ff57c12f3 100644 --- a/update.php +++ b/update.php @@ -186,3 +186,10 @@ function update_1020() { q("ALTER TABLE `profile` DROP `showwith`"); q("ALTER TABLE `item` ADD `thr-parent` CHAR( 255 ) NOT NULL AFTER `parent-uri` "); } + +function update_1021() { + q("ALTER TABLE `profile_check` ADD `sec` CHAR( 255 ) NOT NULL AFTER `dfrn_id` "); + q("ALTER TABLE `profile_check` ADD `cid` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `uid`"); + q("ALTER TABLE `item` ADD `private` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `deny_gid` "); +} + diff --git a/view/en/profile.php b/view/en/profile.php index 190a3e297..fa7372668 100644 --- a/view/en/profile.php +++ b/view/en/profile.php @@ -48,7 +48,7 @@ <?php } ?>
<?php if(strlen($profile['pubkey'])) { ?>
- <div class="key" style="display: none"><?php echo $profile['pubkey']; ?></div>
+ <div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
<?php } ?>
</div>
<?php } ?>
|