diff options
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 32 |
1 files changed, 23 insertions, 9 deletions
@@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1098 ); +define ( 'DB_UPDATE_VERSION', 1102 ); define ( 'EOL', '<br />' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -323,11 +323,10 @@ define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior define ( 'UPDATE_FLAGS_UPDATED', 0x0001); +define ( 'UPDATE_FLAGS_FORCED', 0x0002); define ( 'UPDATE_FLAGS_DELETED', 0x1000); - - /** * Maximum number of "people who like (or don't like) this" that we will list by name */ @@ -528,6 +527,8 @@ define ( 'ITEM_MENTIONSME', 0x0400); define ( 'ITEM_NOCOMMENT', 0x0800); // commenting/followups are disabled define ( 'ITEM_OBSCURED', 0x1000); // bit-mangled to protect from casual browsing by site admin define ( 'ITEM_VERIFIED', 0x2000); // Signature verification was successful +define ( 'ITEM_RETAINED', 0x4000); // We looked at this item once to decide whether or not to expire it, and decided not to. + // Don't make us evaluate this same item again. /** * * Reverse the effect of magic_quotes_gpc if it is enabled. @@ -1678,10 +1679,11 @@ function current_theme(){ function current_theme_url($installing = false) { global $a; $t = current_theme(); - $uid = ''; - $uid = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : ''); + $opts = ''; + $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : ''); + $opts .= ((x($a->layout,'schema')) ? '&schema=' . $a->layout['schema'] : ''); if(file_exists('view/theme/' . $t . '/php/style.php')) - return('view/theme/' . $t . '/php/style.pcss' . $uid); + return('view/theme/' . $t . '/php/style.pcss' . $opts); return('view/theme/' . $t . '/css/style.css'); } @@ -1807,8 +1809,16 @@ function construct_page(&$a) { // in case a page has overloaded a module, see if we already have a layout defined // otherwise, if a pdl file exists for this module, use it - if((! count($a->layout)) && ($p = theme_include('mod_' . $a->module . '.pdl')) != '') - comanche_parser($a,@file_get_contents($p)); + if(! count($a->layout)) { + $n = 'mod_' . $a->module . '.pdl' ; + $u = comanche_get_channel_id(); + if($u) + $s = get_pconfig($u,'system',$n); + if((! $s) && (($p = theme_include($n)) != '')) + $s = @file_get_contents($p); + if($s) + comanche_parser($a,$s); + } $comanche = ((count($a->layout)) ? true : false); @@ -1841,7 +1851,11 @@ function construct_page(&$a) { require_once('include/js_strings.php'); - head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css'); + if(x($a->page,'template_style')) + head_add_css($a->page['template_style'] . '.css'); + else + head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css'); + head_add_css('mod_' . $a->module . '.css'); head_add_css(current_theme_url($installing)); |