Project

General

Profile

« Previous | Next » 

Revision 558

Added by Matthias almost 17 years ago

Fixed hardcoded /pages issue in intro page feature

View differences:

trunk/CHANGELOG
10 10
# = Bugfix
11 11
! = Update/Change
12 12

  
13
------------------------------------- 2.7.0 -------------------------------------
14
18-Jan-2008 Thomas Hornik
15
#	fixed two E_NOTICE-warnings in admin/pages/index.php
13
------------------------------------- 2.7.0 -------------------------------------
14

  
16 15
18-Jan-2008 Matthias Gallas
16
#	Fixed hardcoded /pages issue in intro page feature
17 17
+	Added example .htaccess to parse .html files, fixed bug in changeset 555
18 18
!	Revoked parts of changeset 547 and again introduced changeset 540
19 19
+	Added keywords to new files
20 20
18-Jan-2008 Thomas Hornik
21
#	fixed two E_NOTICE-warnings in admin/pages/index.php
21 22
+	added new module-based search-function
22 23
+	added new publish-by-date code
23 24
17-Jan-2008 Christian Sommer
trunk/wb/admin/pages/intro.php
29 29
$admin = new admin('Pages', 'pages_intro');
30 30

  
31 31
// Get page content
32
$filename = WB_PATH.'/pages/intro.php';
32
$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
33 33
if(file_exists($filename)) {
34 34
	$handle = fopen($filename, "r");
35 35
	$content = fread($handle, filesize($filename));
trunk/wb/admin/pages/intro2.php
25 25

  
26 26
// Get posted content
27 27
if(!isset($_POST['content'])) {
28
	header("Location: intro.php");
28
	header("Location: intro".PAGE_EXTENSION."");
29 29
	exit(0);
30 30
} else {
31 31
	$content = $_POST['content'];
......
42 42
require_once(WB_PATH.'/framework/functions.php');
43 43

  
44 44
// Write new content
45
$filename = WB_PATH.PAGES_DIRECTORY.'/intro.php';
45
$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
46 46
$handle = fopen($filename, 'w');
47 47
if(is_writable($filename)) {
48 48
	if(fwrite($handle, $content)) {
trunk/wb/admin/settings/template.html
587 587
		<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
588 588
	</td>
589 589
</tr>
590
<!-- The following lines are deactivated as the Page Extension Feature doesn't work on every server
591 590
<tr class="advanced">
592 591
	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
593 592
	<td class="setting_value" colspan="2">
594 593
		<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
595 594
	</td>
596 595
</tr>
597
-->
598 596
<tr class="advanced">
599 597
	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
600 598
	<td class="setting_value" colspan="2">
trunk/wb/framework/class.frontend.php
67 67
		if((INTRO_PAGE AND !isset($no_intro)) AND (!isset($page_id) OR !is_numeric($page_id))) {
68 68
			// Since we have no page id check if we should go to intro page or default page
69 69
			// Get intro page content
70
			$filename = WB_PATH.PAGES_DIRECTORY.'/intro.php';
70
			$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
71 71
			if(file_exists($filename)) {
72 72
				$handle = @fopen($filename, "r");
73 73
				$content = @fread($handle, filesize($filename));
74 74
				@fclose($handle);
75 75
				$this->preprocess($content);
76
				header("Location: pages/intro.php");   // send intro.php as header to allow parsing of php statements
76
				header("Location: ".WB_URL.PAGES_DIRECTORY."/intro".PAGE_EXTENSION."");   // send intro.php as header to allow parsing of php statements
77 77
				echo ($content);
78 78
				return false;
79 79
			}

Also available in: Unified diff