Skip to content

Commit 3dded95

Browse files
yurabakhtinyurabakhtin
committed
Remove folder "skins_site" completely to use only enabled site skin
1 parent 9cdb0e0 commit 3dded95

21 files changed

Lines changed: 129 additions & 343 deletions

‎conf/_advanced.php‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -503,17 +503,6 @@
503503
$skins_path = $basepath.$skins_subdir; // You should not need to change this
504504
$skins_url = $assets_baseurl.$skins_subdir; // You should not need to change this
505505

506-
/**
507-
* Location of the site skins folder.
508-
*
509-
* Note: This folder NEEDS to by accessible through HTTP. It MAY be replicated on a CDN.
510-
*
511-
* @global string $siteskins_subdir
512-
*/
513-
$siteskins_subdir = 'skins_site/'; // Subdirectory relative to base
514-
$siteskins_path = $basepath.$siteskins_subdir; // You should not need to change this
515-
$siteskins_url = $assets_baseurl.$siteskins_subdir; // You should not need to change this
516-
517506
/**
518507
* Location of the email skins folder.
519508
*

‎htsrv/download.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@
4646
{ // Bad request, Display "404 not found" page
4747
load_funcs( 'skins/_skin.funcs.php' );
4848
siteskin_init();
49-
siteskin_include( '_404_not_found.main.php' ); // error & exit
49+
siteskin_include( '_404_not_found.main.php' ); // error
5050
exit(0);
51+
// EXIT.
5152
}
5253

5354
apm_log_custom_param( 'FilePath', $download_File->get_full_path() );

‎htsrv/track.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@
3737
{ // Goal key doesn't exist in DB
3838
load_funcs( 'skins/_skin.funcs.php' );
3939
siteskin_init();
40-
siteskin_include( '_404_basic_not_found.main.php' ); // error & exit
40+
siteskin_include( '_404_basic_not_found.main.php' ); // error
4141
exit(0);
42+
// EXIT.
4243
}
4344

4445
if( ! empty( $Goal->redir_url ) || ! empty( $Goal->temp_redir_url ) )

‎inc/_blog_main.inc.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
if( empty( $Blog ) )
5454
{
5555
siteskin_init();
56-
siteskin_include( '_404_blog_not_found.main.php' ); // error & exit
56+
siteskin_include( '_404_blog_not_found.main.php' ); // error
57+
exit(0);
5758
// EXIT.
5859
}
5960

@@ -514,7 +515,8 @@
514515
if( $stats || $disp == 'stats' )
515516
{ // This used to be a spamfest...
516517
siteskin_init();
517-
siteskin_include( '_410_stats_gone.main.php' ); // error & exit
518+
siteskin_include( '_410_stats_gone.main.php' ); // error
519+
exit(0);
518520
// EXIT.
519521
}
520522
elseif( !empty($preview) )

‎inc/_core/_template.funcs.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,17 @@ function get_require_url( $lib_file, $relative_to = 'rsc_url', $subfolder = 'js'
961961
$lib_url = $Blog->get_local_rsc_url().$subfolder.'/'.$lib_file;
962962
}
963963
}
964+
elseif( $relative_to === 'siteskin' )
965+
{ // Get the file from current site skin if it is enabled otherwise from relative current page or head tag <base>:
966+
if( $site_Skin = & get_site_Skin() )
967+
{
968+
$lib_url = $site_Skin->get_url().$lib_file;
969+
}
970+
else
971+
{
972+
$lib_url = $lib_file;
973+
}
974+
}
964975
else
965976
{ // Get the file from $rsc_url:
966977
$lib_url = $rsc_url.$subfolder.'/'.$lib_file;

‎inc/sessions/model/_hit.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ function detect_referer( $referer = NULL )
362362
{
363363
global $Debuglog, $debug;
364364
global $self_referer_list, $SpecialList; // used to detect $referer_type
365-
global $skins_path, $siteskins_path;
365+
global $skins_path;
366366
global $Settings;
367367

368368
if( isset($referer) )
@@ -459,7 +459,7 @@ function detect_referer( $referer = NULL )
459459
if( $Settings->get('antispam_block_spam_referers') )
460460
{ // In order to preserve server resources, we're going to stop processing immediatly (no logging)!!
461461
siteskin_init();
462-
siteskin_include( '_403_referer_spam.main.php' ); // error & exit
462+
siteskin_include( '_403_referer_spam.main.php' ); // error
463463
exit(0); // just in case.
464464
// THIS IS THE END!!
465465
}

‎inc/skins/_skin.funcs.php‎

Lines changed: 64 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,29 +1557,61 @@ function skin_init( $disp )
15571557
}
15581558
}
15591559

1560-
function siteskin_init()
1560+
1561+
/**
1562+
* Get site Skin global object
1563+
*
1564+
* @return object Site Skin
1565+
*/
1566+
function & get_site_Skin()
15611567
{
1562-
global $Settings;
1568+
global $site_Skin;
15631569

1564-
if( ! $Settings->get( 'site_skins_enabled' ) )
1565-
{ // Site skins are not enabled:
1566-
return;
1570+
if( ! isset( $site_Skin ) )
1571+
{ // Initialize site Skin only first time:
1572+
1573+
global $Settings;
1574+
if( ! $Settings->get( 'site_skins_enabled' ) )
1575+
{ // Site skins are not enabled:
1576+
$site_Skin = NULL;
1577+
return $site_Skin;
1578+
}
1579+
1580+
global $Session;
1581+
if( ! empty( $Session ) )
1582+
{ // Get site skin Id depending on current session:
1583+
if( $Session->is_mobile_session() )
1584+
{ // Mobile session:
1585+
$skin_ID = $Settings->get( 'mobile_skin_ID' );
1586+
}
1587+
elseif( $Session->is_tablet_session() )
1588+
{ // Tablet session:
1589+
$skin_ID = $Settings->get( 'tablet_skin_ID' );
1590+
}
1591+
}
1592+
if( empty( $skin_ID ) )
1593+
{ // Use normal skin ID by default when mobile and tablet skins are not defined for site:
1594+
$skin_ID = $Settings->get( 'normal_skin_ID' );
1595+
}
1596+
1597+
// Try to get site Skin from DB by ID:
1598+
$SkinCache = & get_SkinCache();
1599+
$site_Skin = & $SkinCache->get_by_ID( $skin_ID, false, false );
15671600
}
15681601

1569-
// Get site skin:
1570-
$skin_ID = $Settings->get( 'normal_skin_ID' );
1571-
$SkinCache = & get_SkinCache();
1572-
$site_Skin = & $SkinCache->get_by_ID( $skin_ID, false, false );
1602+
return $site_Skin;
1603+
}
1604+
15731605

1574-
if( $site_Skin )
1606+
/**
1607+
* Initalize site Skin
1608+
*/
1609+
function siteskin_init()
1610+
{
1611+
if( $site_Skin = & get_site_Skin() )
15751612
{ // Initialize site skin:
15761613
$site_Skin->siteskin_init();
15771614
}
1578-
else
1579-
{ // Fallback:
1580-
// The following is temporary and should be moved to some SiteSkin class
1581-
siteskin_include( '_skin_init.inc.php' );
1582-
}
15831615
}
15841616

15851617

@@ -1931,14 +1963,13 @@ function skin_template_path( $template_name )
19311963
*
19321964
* @param string Template name
19331965
* @param array Params
1934-
* @param boolean force include even if sitewide header/footer not enabled
19351966
*/
1936-
function siteskin_include( $template_name, $params = array(), $force = false )
1967+
function siteskin_include( $template_name, $params = array() )
19371968
{
1938-
global $Settings, $siteskins_path, $skins_path, $Blog;
1969+
global $Settings, $skins_path, $Blog;
19391970

1940-
if( !$Settings->get( 'site_skins_enabled' ) && !$force )
1941-
{ // Site skins are not enabled and we don't want to force either
1971+
if( ! $Settings->get( 'site_skins_enabled' ) )
1972+
{ // Site skins are not enabled:
19421973
return;
19431974
}
19441975

@@ -1961,31 +1992,17 @@ function siteskin_include( $template_name, $params = array(), $force = false )
19611992
$timer_name = 'siteskin_include('.$template_name.')';
19621993
$Timer->resume( $timer_name );
19631994

1964-
// Get site skin:
1965-
$skin_ID = $Settings->get( 'normal_skin_ID' );
1966-
$SkinCache = & get_SkinCache();
1967-
$site_Skin = & $SkinCache->get_by_ID( $skin_ID, false, false );
1995+
// Get site Skin:
1996+
$site_Skin = & get_site_Skin();
19681997

1969-
if( $site_Skin && file_exists( $skins_path.$site_Skin->folder.'/'.$template_name ) )
1998+
if( $site_Skin && file_exists( $site_Skin->get_path().$template_name ) )
19701999
{ // Use site skin template:
1971-
$file = $skins_path.$site_Skin->folder.'/'.$template_name;
1972-
$debug_info = '<b>Site Skin template</b>: '.rel_path_to_base($file);
2000+
$file = $site_Skin->get_path().$template_name;
2001+
$debug_info = '<b>Site Skin template</b>: '.rel_path_to_base( $file );
19732002
$disp_handled = 'skin';
19742003
}
1975-
elseif( file_exists( $siteskins_path.'custom/'.$template_name ) )
1976-
{ // Use the custom template:
1977-
$file = $siteskins_path.'custom/'.$template_name;
1978-
$debug_info = '<b>Custom template</b>: '.rel_path_to_base($file);
1979-
$disp_handled = 'custom';
1980-
}
1981-
elseif( file_exists( $siteskins_path.$template_name ) ) // Try to include standard template only if custom template doesn't exist
1982-
{ // Use the default/fallback template:
1983-
$file = $siteskins_path.$template_name;
1984-
$debug_info = '<b>Fallback to</b>: '.rel_path_to_base($file);
1985-
$disp_handled = 'fallback';
1986-
}
19872004
else
1988-
{
2005+
{ // Site skin is wrong or the requested template file is not found in current site skin:
19892006
$disp_handled = false;
19902007
}
19912008

@@ -2004,30 +2021,25 @@ function siteskin_include( $template_name, $params = array(), $force = false )
20042021
$display_includes = false;
20052022
}
20062023
if( $display_includes )
2007-
{ // Wrap the include with a visible div:
2024+
{ // Wrap the include with a visible div:
20082025
echo '<div class="dev-blocks dev-blocks--siteinclude">';
20092026
echo '<div class="dev-blocks-name">siteskin_include( <b>'.$template_name.'</b> ) -> '.$debug_info.'</div>';
20102027
}
20112028

20122029

2013-
if($disp_handled)
2014-
{
2015-
$Debuglog->add('siteskin_include: '.rel_path_to_base($file), 'skins');
2030+
if( $disp_handled )
2031+
{ // Include site skin template file:
2032+
$Debuglog->add('siteskin_include: '.rel_path_to_base( $file ), 'skins');
20162033
require $file;
20172034
}
20182035
else
2019-
{ // nothing handled the display
2020-
printf( '<div class="skin_error">Site template [%s] not found.</div>', $template_name );
2021-
if( !empty($current_User) && $current_User->level == 10 )
2022-
{
2023-
printf( '<div class="skin_error">User level 10 help info: [%s]</div>', $siteskins_path.$template_name );
2024-
}
2036+
{ // Nothing handled the display:
2037+
printf( '<div class="skin_error">Site skin template [%s] not found.</div>', $template_name );
20252038
}
20262039

20272040

20282041
if( $display_includes )
2029-
{ // End of visible container:
2030-
// echo get_icon( 'pixel', 'imgtag', array( 'class' => 'clear' ) );
2042+
{ // End of visible container:
20312043
echo '</div>';
20322044
}
20332045

skins_site/_403_referer_spam.main.php renamed to skins/default_site_skin/_403_referer_spam.main.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* This page displays an error message when we have detected referer spam.
44
*
5-
* @package evocore
5+
* @package skins
6+
* @subpackage default_site_skin
67
*/
78
if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
89

@@ -13,7 +14,7 @@
1314

1415
$page_title = '403 Forbidden - Please stop referer spam.';
1516
// -------------------------- HTML HEADER INCLUDED HERE --------------------------
16-
siteskin_include( '_html_header.inc.php', array(), true ); // force include even if site headers/footers are not enabled
17+
siteskin_include( '_html_header.inc.php' );
1718
// -------------------------------- END OF HEADER --------------------------------
1819

1920
// ---------------------------- SITE HEADER INCLUDED HERE ----------------------------
@@ -37,8 +38,6 @@
3738
// ------------------------------- END OF SITE FOOTER --------------------------------
3839

3940
// -------------------------- HTML FOOTER INCLUDED HERE --------------------------
40-
siteskin_include( '_html_footer.inc.php', array(), true ); // force include even if site headers/footers are not enabled
41+
siteskin_include( '_html_footer.inc.php' );
4142
// -------------------------------- END OF FOOTER --------------------------------
42-
43-
exit(0);
4443
?>

skins_site/_404_basic_not_found.main.php renamed to skins/default_site_skin/_404_basic_not_found.main.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*
55
* This happens when you request an invalid tracking code on track.php for example
66
*
7-
* @package evocore
7+
* @package skins
8+
* @subpackage default_site_skin
89
*/
910
if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1011

@@ -13,7 +14,7 @@
1314

1415
$page_title = '404 Not Found';
1516
// -------------------------- HTML HEADER INCLUDED HERE --------------------------
16-
siteskin_include( '_html_header.inc.php', array(), true ); // force include even if site headers/footers are not enabled
17+
siteskin_include( '_html_header.inc.php' );
1718
// -------------------------------- END OF HEADER --------------------------------
1819

1920
?>
@@ -22,8 +23,6 @@
2223
<?php
2324

2425
// -------------------------- HTML FOOTER INCLUDED HERE --------------------------
25-
siteskin_include( '_html_footer.inc.php', array(), true ); // force include even if site headers/footers are not enabled
26+
siteskin_include( '_html_footer.inc.php' );
2627
// -------------------------------- END OF FOOTER --------------------------------
27-
28-
exit(0);
2928
?>

skins_site/_404_blog_not_found.main.php renamed to skins/default_site_skin/_404_blog_not_found.main.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
*
55
* This happens when you request an url of the form http://.../some_stub_file.php/some_malformed_extra_path/...
66
*
7-
* @package evocore
7+
* @package skins
8+
* @subpackage default_site_skin
89
*/
910
if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1011

1112
header_http_response('404 Not Found');
1213

1314
$page_title = '404 Not Found';
1415
// -------------------------- HTML HEADER INCLUDED HERE --------------------------
15-
siteskin_include( '_html_header.inc.php', array(), true ); // force include even if site headers/footers are not enabled
16+
siteskin_include( '_html_header.inc.php' );
1617
// -------------------------------- END OF HEADER --------------------------------
1718

1819
// ---------------------------- SITE HEADER INCLUDED HERE ----------------------------
@@ -29,8 +30,6 @@
2930
// ------------------------------- END OF SITE FOOTER --------------------------------
3031

3132
// -------------------------- HTML FOOTER INCLUDED HERE --------------------------
32-
siteskin_include( '_html_footer.inc.php', array(), true ); // force include even if site headers/footers are not enabled
33+
siteskin_include( '_html_footer.inc.php' );
3334
// -------------------------------- END OF FOOTER --------------------------------
34-
35-
exit(0);
3635
?>

0 commit comments

Comments
 (0)