Context Navigation

← Previous Change
Next Change →

Changeset 1736 for trunk

Timestamp:

08/24/2008 07:47:36 PM (5 months ago)

Author:

jeena

Message:

changed PHP_SELF to SCRIPT_NAME

Location:

trunk

Files:

: 16 modified

README.txt (modified) (1 diff)
admin/auth.php (modified) (1 diff)
admin/blog.func.php (modified) (2 diffs)
admin/change.php (modified) (1 diff)
admin/login.php (modified) (2 diffs)
admin/logout.php (modified) (1 diff)
admin/media/upload-picture.php (modified) (1 diff)
admin/media/upload-teaser.php (modified) (1 diff)
admin/update.php (modified) (1 diff)
index.php (modified) (1 diff)
scripts/general.func.php (modified) (1 diff)
scripts/jlogHTTP_Request.php (modified) (1 diff)
scripts/prepend.inc.php (modified) (1 diff)
scripts/settings.class.php (modified) (2 diffs)
setup.php (modified) (1 diff)
xmlrpc.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/README.txt

r1688	r1736
1	1	### Weblogsystem Jlog
2		### Programmiert von Jeena Paradies ~~<jlog@jeenaparadies.net>~~
3		### ~~Hilfsautoren: Dennis Riehle, Robert Bienert, Andreas Brock~~
	2	### Programmiert von Jeena Paradies, Dennis Riehle, Robert Bienert
	3	### E-Mail: <jlog@jeenaparadies.net>
4	4	### Projektseite: <http://jeenaparadies.net/projects/jlog/>
5	5

trunk/admin/auth.php

r1688	r1736
1	1	<?php
2		session_start();
	2	ini_set("session.use_trans_sid", false);
	3	session_start();
3	4
4		$hostname = $_SERVER['HTTP_HOST'];
5		~~$path = dirname($_SERVER['PHP_SELF~~']);
	5	$hostname = $_SERVER['HTTP_HOST'];
	6	$path = dirname($_SERVER['SCRIPT_NAME']);
6	7
7		if (!isset($_SESSION['logged_in']) \|\| !$_SESSION['logged_in']) {
8		header('Location: http://'.$hostname.($path == '/' ? '' : $path).'/login.php?url='.urlencode($_SERVER["REQUEST_URI"]));
9		exit;
10		}
11		?>
	8	if (!isset($_SESSION['logged_in']) \|\| !$_SESSION['logged_in']) {
	9	header('Location: http://'.$hostname.($path == '/' ? '' : $path).'/login.php?url='.urlencode($_SERVER["REQUEST_URI"]));
	10	exit;
	11	}
	12
	13	// eof

trunk/admin/blog.func.php

r1733	r1736
75	75
76	76	$o = "
77		<form method='post' id='entryform' action='".$_SERVER['~~PHP_SELF~~']."' accept-charset='UTF-8'>
	77	<form method='post' id='entryform' action='".$_SERVER['SCRIPT_NAME']."' accept-charset='UTF-8'>
78	78	<fieldset><legend>".$l['admin']['metadata']."</legend>
79	79	<p><label>".$l['admin']['section']."</label><br />
…	…
208	208	### Plugin Hook
209	209	$plugins->callHook('insertEntry', $id, $form_input);
210
	210	echo $id;
211	211	return $id;
212	212	}

trunk/admin/change.php

r1731	r1736
18	18	elseif ($get['action'] == "trash" AND empty($post['trash'])) {
19	19	$c['main'] .= "
20		<form method='post' id='entryform' action='".$_SERVER['~~PHP_SELF~~']."?id=".$get['id']."&action=trash' accept-charset='UTF-8'>
	20	<form method='post' id='entryform' action='".$_SERVER['SCRIPT_NAME']."?id=".$get['id']."&action=trash' accept-charset='UTF-8'>
21	21	<p>".$l['admin']['rearly_delete']." <input class='send' type='submit' name='trash' value='".$l['admin']['yes']."' />
22	22	".add_session_id_input_tag()."

trunk/admin/login.php

r1731	r1736
6	6	###
7	7	### adapted for Jlog by Jeena Paradies
	8
	9	ini_set("session.use_trans_sid", false);
8	10
9	11	define("JLOG_ADMIN", true);
…	…
24	26	$url = !empty($post['url']) ? $post['url'] : "";
25	27	$hostname = $_SERVER['HTTP_HOST'];
26		$path = dirname($_SERVER['~~PHP_SELF~~']) . "/";
	28	$path = dirname($_SERVER['SCRIPT_NAME']) . "/";
27	29
28	30	if ( md5( $passwort ) == JLOG_ADMIN_PASSWORD) {

trunk/admin/logout.php

r1688	r1736
4	4
5	5	$hostname = $_SERVER['HTTP_HOST'];
6		$path = dirname(dirname($_SERVER['~~PHP_SELF~~']));
	6	$path = dirname(dirname($_SERVER['SCRIPT_NAME']));
7	7
8	8	header('Location: http://'.$hostname.($path == '/' ? '' : $path).'/');

trunk/admin/media/upload-picture.php

r1731	r1736
76	76	?>
77	77	<p><?php echo $l['admin']['pic_instructions'] ?></p>
78		<form action="<?php echo $_SERVER['~~PHP_SELF~~']; ?>" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
	78	<form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
79	79	<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
80	80	<?php echo add_session_id_input_tag() ?>

trunk/admin/media/upload-teaser.php

r1731	r1736
80	80	?>
81	81	<p><?php echo $l['admin']['pic_instr_teaser'] ?></p>
82		<form action="<?php echo $_SERVER['~~PHP_SELF~~']; ?>" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
	82	<form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
83	83	<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
84	84	<?php echo add_session_id_input_tag() ?>

trunk/admin/update.php

r1712	r1736
44	44
45	45	if(!isset($_POST['update'])) {
46		$c['main'] .= "<form action='".$_SERVER['~~PHP_SELF~~']."' method='post' accept-charset='UTF-8'>
	46	$c['main'] .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post' accept-charset='UTF-8'>
47	47	<p><label for='password'>Bitte geben Sie Ihr aktuelles Administrator-Passwort ein (zum Schutz gegen unbefugtes Aufrufen dieses Scriptes):</label><br />
48	48	<input type='password' name='password' id='password' value='' /></p>

trunk/index.php

r1731	r1736
25	25
26	26	if(!file_exists(dirname( __FILE__ ).DIRECTORY_SEPARATOR.'personal'.DIRECTORY_SEPARATOR.'settings.inc.php')) {
27		if(dirname($_SERVER['~~PHP_SELF']) !== "/") $dir = dirname($_SERVER['PHP_SELF~~']);
	27	if(dirname($_SERVER['SCRIPT_NAME']) !== "/") $dir = dirname($_SERVER['SCRIPT_NAME']);
28	28	header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/setup.php");
29	29	}

trunk/scripts/general.func.php

r1731	r1736
178	178
179	179	$output .= $bbcode->parse($data['content']);
180		$path_parts = pathinfo($_SERVER['~~PHP_SELF~~']);
	180	$path_parts = pathinfo($_SERVER['SCRIPT_NAME']);
181	181
182	182	if($data['section'] == 'weblog' AND $path_parts['basename'] != 'log.php') {

trunk/scripts/jlogHTTP_Request.php

r1510	r1736
1643	1643	$this->host = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
1644	1644	$this->port = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
1645		$this->path = !empty($HTTP_SERVER_VARS['~~PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF~~'] : '/';
	1645	$this->path = !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : '/';
1646	1646	$this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
1647	1647	$this->anchor = '';

trunk/scripts/prepend.inc.php

r1731	r1736
25	25
26	26	// load settings and version information
27		// error_reporting(E_ALL ^ E_NOTICE);
	27	error_reporting(E_ALL ^ E_NOTICE);
28	28	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."..".DIRECTORY_SEPARATOR."personal".DIRECTORY_SEPARATOR."settings.inc.php");
29	29	require_once(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."version.inc.php");

trunk/scripts/settings.class.php

r1730	r1736
230	230	$uri .= ':' . $port;
231	231	}
232		$uri .= dirname($_SERVER['~~PHP_SELF~~']);
	232	$uri .= dirname($_SERVER['SCRIPT_NAME']);
233	233
234	234	return $uri;
…	…
293	293	// do the form
294	294	$form = "
295		<form action='".$_SERVER['~~PHP_SELF~~']."' method='post'>
	295	<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>
296	296	<fieldset><legend>".$this->l['admin']['m_metadata']."</legend>
297	297	<p><label for='language'>".$this->l['admin']['m_language']."</label><br />";

trunk/setup.php

r1731	r1736
20	20	// defining to avoid notifications
21	21	define("JLOG_WEBSITE", $_SERVER["HTTP_HOST"]);
22		define("JLOG_PATH", dirname("http://".$_SERVER["HTTP_HOST"].$_SERVER["~~PHP_SELF~~"]));
	22	define("JLOG_PATH", dirname("http://".$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]));
23	23
24	24	// read prefered language from browser

trunk/xmlrpc.php

r1707	r1736
99	99	if(PEAR::isError($s->sendRequest())) $this->send_error(16, 'The source URI does not exist.');
100	100	else {
101		$source = $s->getResponseBody();
	101	$source = $s->getResponseBody();
102	102	$source = strip_tags(str_replace('<!DOCTYPE','<DOCTYPE', $source), '<title><a>');
103	103
…	…
107	107	preg_match('\|<title>([^<]*?)</title>\|is', $source, $title);
108	108
109		if(! $utf8 = preg_match ('/charset\s=\sutf-8/i', $s->getResponseHeader("Content-Type")))
110		$utf8 = 'application/xhtml+xml' == strtolower(trim($s->getResponseHeader("Content-Type")));
	109	if(! $utf8 = preg_match ('/charset\s=\sutf-8/i', $s->getResponseHeader("Content-Type")))
	110	$utf8 = 'application/xhtml+xml' == strtolower(trim($s->getResponseHeader("Content-Type")));
111	111
112	112	$this->title = empty($title[1]) ? $this->sourceURI : html_entity_decode($utf8 ? utf8_decode($title[1]) : $title[1]);

Context Navigation

Changeset 1736 for trunk

Legend:

Download in other formats: