Startseite Erkunden Hilfe
Anmelden
richard
/
sorbetcms
Beobachten 1
Favorit hinzufügen 0
Fork 1
Code Issues 0 Pull-Requests 0 Commits 290 Releases 0 Wiki
Quellcode durchsuchen

changed '<?=' for '<?php echo'

Victor De la Rocha vor 17 Jahren
Ursprung
73513b8f82
Commit
ccdb6dc36b
7 geänderte Dateien mit 164 neuen und 161 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 15 15
      admin/admin.php
  2. 7 7
      admin/close.php
  3. 18 18
      admin/index.php
  4. 81 81
      admin/options.php
  5. 16 16
      admin/settings.php
  6. 13 13
      admin/user.php
  7. 14 11
      login.php

+ 15 - 15
admin/admin.php Datei anzeigen 

@@ -25,7 +25,7 @@ if ($user->isAdmin()) {
25 25 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
26 26 
 	<html xmlns="http://www.w3.org/1999/xhtml">
27 27 
 	<head>
28 
-		<title>gelato :: <?=__("admin users")?></title>
28 
+		<title>gelato :: <?php echo __("admin users")?></title>
29 29 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
30 30 
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
31 31 
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />

@@ -49,13 +49,13 @@ if ($user->isAdmin()) {
49 49 
 	</head>
50 50
51 51 
 	<body>
52 
-		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
52 
+		<div id="div-process" style="display:none;"><?php echo __("Processing request...")?></div>
53 53 
 		<div id="cont">
54 54 
 			<div id="head">
55 
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
55 
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
56 56 
 				<ul id="nav">
57 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="Take me to the tumblelog"><?=__("View Tumblelog")?></a></li>
58 
-					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato;?>/admin/ajax.php?action=close');"><?=__("Log out")?></a></li>
57 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="Take me to the tumblelog"><?php echo __("View Tumblelog")?></a></li>
58 
+					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato;?>/admin/ajax.php?action=close');"><?php echo __("Log out")?></a></li>
59 59 
 			  	</ul>
60 60 
 			</div>
61 61 
 			<div id="main">				

@@ -63,10 +63,10 @@ if ($user->isAdmin()) {
63 63 
 				<div class="box">
64 64 
 					<ul class="menu manage">
65 65 
 					<h3>Manage</h3>
66 
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/settings.php"><?=__("Settings")?></a></li>
67 
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/index.php"><?=__("Posts")?></a></li>
68 
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/user.php"><?=__("Add user")?></a></li>
69 
-					<li class="selected"><a><?=__("Users")?></a></li>
66 
+					<li><a href="<?php echo $conf->urlGelato;?>/admin/settings.php"><?php echo __("Settings")?></a></li>
67 
+					<li><a href="<?php echo $conf->urlGelato;?>/admin/index.php"><?php echo __("Posts")?></a></li>
68 
+					<li><a href="<?php echo $conf->urlGelato;?>/admin/user.php"><?php echo __("Add user")?></a></li>
69 
+					<li class="selected"><a><?php echo __("Users")?></a></li>
70 70 
 					</ul>
71 71 
 					<p>&nbsp;</p>
72 72 
 <?php				

@@ -100,9 +100,9 @@ if ($user->isAdmin()) {
100 100 
 						<table class="sortable" id="admin-table">
101 101 
 							<thead>
102 102 
 								<tr>
103 
-									<th scope="col"><?=__("Login")?></th>
104 
-									<th scope="col"><?=__("Name")?></th>
105 
-									<th colspan="2" scope="col" class="unsortable"><?=__("Actions")?></th>
103 
+									<th scope="col"><?php echo __("Login")?></th>
104 
+									<th scope="col"><?php echo __("Name")?></th>
105 
+									<th colspan="2" scope="col" class="unsortable"><?php echo __("Actions")?></th>
106 106 
 								</tr>
107 107 
 							</thead>
108 108 
 							<tbody>

@@ -120,10 +120,10 @@ if ($user->isAdmin()) {
120 120 
 									<?php echo $register["name"]."\n"; ?>
121 121 
 								</td>
122 122 
 								<td>
123 
-									<a href="user.php?edit=<?php echo $register["id_user"]; ?>"><?=__("Edit")?></a>
123 
+									<a href="user.php?edit=<?php echo $register["id_user"]; ?>"><?php echo __("Edit")?></a>
124 124 
 								</td>
125 125 
 								<td>
126 
-									<a href="user.php?delete=<?php echo $register["id_user"]; ?>"><?=__("Delete")?></a>
126 
+									<a href="user.php?delete=<?php echo $register["id_user"]; ?>"><?php echo __("Delete")?></a>
127 127 
 								</td>
128 128 
 							</tr>
129 129 
 <?php

@@ -132,7 +132,7 @@ if ($user->isAdmin()) {
132 132 
 					else {
133 133 
 ?>
134 134 
 						<tr>
135 
-							<td colspan="4"><div class="exito"><?=__("No users available.")?></div></td>
135 
+							<td colspan="4"><div class="exito"><?php echo __("No users available.")?></div></td>
136 136 
 						</tr>
137 137 
 <?php
138 138 
 					}

+ 7 - 7
admin/close.php Datei anzeigen 

@@ -24,7 +24,7 @@ $user->closeSession()
24 24 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
25 25 
 	<html xmlns="http://www.w3.org/1999/xhtml">
26 26 
 	<head>
27 
-		<title>gelato :: <?=__("logout")?></title>
27 
+		<title>gelato :: <?php echo __("logout")?></title>
28 28 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
29 29 
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
30 30 
 		<meta http-equiv="Refresh" content="3;URL=../login.php" />

@@ -36,17 +36,17 @@ $user->closeSession()
36 36 
 <body>
37 37 
 <div id="cont">
38 38 
 			<div id="head">
39 
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
39 
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
40 40 
 				<ul id="nav">
41 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
41 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
42 42 
 			  	</ul>
43 43 
 			</div>
44 44 
 			<div id="main">
45 45
46 46 
 				<div class="box">
47 47 
 					<ul class="menu manage">
48 
-					<h3><?=__("Closing session")?></h3>
49 
-					<li class="selected"><a><?=__("logoff")?></a></li>
48 
+					<h3><?php echo __("Closing session")?></h3>
49 
+					<li class="selected"><a><?php echo __("logoff")?></a></li>
50 50 
 					</ul>
51 51
52 52 
 					<div class="tabla">

@@ -54,11 +54,11 @@ $user->closeSession()
54 54 
 <?php
55 55 
 						if (@session_destroy()) {
56 56 
 ?>
57 
-							<h2><?=__("Ending session...")?></h2>
57 
+							<h2><?php echo __("Ending session...")?></h2>
58 58 
 <?php
59 59 
 						} else {
60 60 
 ?>
61 
-							<h2><?=__("Has happened an error when closing the session.")?></h2>
61 
+							<h2><?php echo __("Has happened an error when closing the session.")?></h2>
62 62 
 <?php
63 63 
 						}
64 64 
 ?>

+ 18 - 18
admin/index.php Datei anzeigen 

@@ -101,7 +101,7 @@ if ($user->isAdmin()) {
101 101 
 	<head>
102 102 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
103 103 
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
104 
-		<title>gelato :: <?=__("control panel")?></title>
104 
+		<title>gelato :: <?php echo __("control panel")?></title>
105 105 
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
106 106 
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
107 107 
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>

@@ -138,26 +138,26 @@ if ($user->isAdmin()) {
138 138 
 	</head>
139 139
140 140 
 	<body>
141 
-		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
141 
+		<div id="div-process" style="display:none;"><?php echo __("Processing request...")?></div>
142 142 
 		<div id="cont">
143 143 
 			<div id="head">
144 
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
144 
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
145 145 
 				<ul id="nav">
146 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("View Tumblelog")?></a></li>
147 
-					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato;?>/admin/ajax.php?action=close');"><?=__("Log out")?></a></li>
146 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("View Tumblelog")?></a></li>
147 
+					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato;?>/admin/ajax.php?action=close');"><?php echo __("Log out")?></a></li>
148 148 
 			  	</ul>
149 149 
 			</div>
150 150 
 			<div id="main">
151 151 
 				<div class="box">
152 152 
 					<ul class="menu">
153 
-					<h3><?=__("New Post")?></h3>
154 
-					<li<?php echo ($_GET["new"]=="conversation") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=conversation"><img src="css/images/comments.png" alt="New chat" /> <?=__("Chat")?></a></li>
155 
-					<li<?php echo ($_GET["new"]=="quote") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=quote"><img src="css/images/quote.png" alt="New qoute" /> <?=__("Quote")?></a></li>
156 
-					<li<?php echo ($_GET["new"]=="url") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=url"><img src="css/images/world.png" alt="New link" /> <?=__("Link")?></a></li>
157 
-					<li<?php echo ($_GET["new"]=="mp3") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=mp3"><img src="css/images/music.png" alt="New audio" /> <?=__("Audio")?></a></li>
158 
-					<li<?php echo ($_GET["new"]=="video") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=video"><img src="css/images/film.png" alt="New video" /> <?=__("Video")?></a></li>
159 
-					<li<?php echo ($_GET["new"]=="photo") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=photo"><img src="css/images/image.png" alt="New picture" /> <?=__("Picture")?></a></li>
160 
-					<li<?php echo ($_GET["new"]=="post") ? " class=\"selected\"" : ""; echo (!isset($_GET["new"])) ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=post"><img src="css/images/page.png" alt="New post" /> <?=__("Regular")?></a></li>
153 
+					<h3><?php echo __("New Post")?></h3>
154 
+					<li<?php echo ($_GET["new"]=="conversation") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=conversation"><img src="css/images/comments.png" alt="New chat" /> <?php echo __("Chat")?></a></li>
155 
+					<li<?php echo ($_GET["new"]=="quote") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=quote"><img src="css/images/quote.png" alt="New qoute" /> <?php echo __("Quote")?></a></li>
156 
+					<li<?php echo ($_GET["new"]=="url") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=url"><img src="css/images/world.png" alt="New link" /> <?php echo __("Link")?></a></li>
157 
+					<li<?php echo ($_GET["new"]=="mp3") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=mp3"><img src="css/images/music.png" alt="New audio" /> <?php echo __("Audio")?></a></li>
158 
+					<li<?php echo ($_GET["new"]=="video") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=video"><img src="css/images/film.png" alt="New video" /> <?php echo __("Video")?></a></li>
159 
+					<li<?php echo ($_GET["new"]=="photo") ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=photo"><img src="css/images/image.png" alt="New picture" /> <?php echo __("Picture")?></a></li>
160 
+					<li<?php echo ($_GET["new"]=="post") ? " class=\"selected\"" : ""; echo (!isset($_GET["new"])) ? " class=\"selected\"" : ""; ?>><a href="<?php echo $conf->urlGelato;?>/admin/index.php?new=post"><img src="css/images/page.png" alt="New post" /> <?php echo __("Regular")?></a></li>
161 161 
 					</ul>
162 162 
 					<p>&nbsp;</p>
163 163 
 <?php			

@@ -302,7 +302,7 @@ if ($user->isAdmin()) {
302 302 
 							}
303 303 
 ?>
304 304 
 								<p>
305 
-									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;"><a href="http://hobix.com/textile/">Textile</a> <?=__("syntax is supported.")?></span>
305 
+									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;"><a href="http://hobix.com/textile/">Textile</a> <?php echo __("syntax is supported.")?></span>
306 306 
 								</p>
307 307 
 								<p>
308 308 
 									<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />

@@ -318,10 +318,10 @@ if ($user->isAdmin()) {
318 318 
 				<div class="box">
319 319 
 					<ul class="menu manage">
320 320 
 					<h3>Manage</h3>
321 
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/settings.php"><?=__("Settings")?></a></li>
322 
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/options.php"><?=__("Options")?></a></li>
323 
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/admin.php"><?=__("Users")?></a></li>
324 
-					<li class="selected"><a><?=__("Posts")?></a></li>
321 
+					<li><a href="<?php echo $conf->urlGelato;?>/admin/settings.php"><?php echo __("Settings")?></a></li>
322 
+					<li><a href="<?php echo $conf->urlGelato;?>/admin/options.php"><?php echo __("Options")?></a></li>
323 
+					<li><a href="<?php echo $conf->urlGelato;?>/admin/admin.php"><?php echo __("Users")?></a></li>
324 
+					<li class="selected"><a><?php echo __("Posts")?></a></li>
325 325 
 					</ul>
326 326
327 327 
 <?php

+ 81 - 81
admin/options.php Datei anzeigen 

@@ -58,7 +58,7 @@ if ($user->isAdmin()) {
58 58 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
59 59 
 	<html xmlns="http://www.w3.org/1999/xhtml">
60 60 
 	<head>
61 
-		<title>gelato :: <?=__("options")?></title>
61 
+		<title>gelato :: <?php echo __("options")?></title>
62 62 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
63 63 
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
64 64 
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />

@@ -81,23 +81,23 @@ if ($user->isAdmin()) {
81 81 
 	</head>
82 82
83 83 
 	<body>
84 
-		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
84 
+		<div id="div-process" style="display:none;"><?php echo __("Processing request...")?></div>
85 85 
 		<div id="cont">
86 86 
 			<div id="head">
87 
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
87 
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
88 88 
 				<ul id="nav">
89 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
89 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
90 90 
 			  	</ul>
91 91 
 			</div>
92 92 
 			<div id="main">
93 93
94 94 
 				<div class="box">
95 95 
 					<ul class="menu manage">
96 
-					<h3><?=__("Tumblelog options")?></h3>
97 
-					<li><a href="index.php"><?=__("Post")?></a></li>
98 
-					<li><a href="admin.php"><?=__("Users")?></a></li>
99 
-					<li><a href="settings.php"><?=__("Settings")?></a></li>
100 
-					<li class="selected"><a><?=__("Options")?></a></li>
96 
+					<h3><?php echo __("Tumblelog options")?></h3>
97 
+					<li><a href="index.php"><?php echo __("Post")?></a></li>
98 
+					<li><a href="admin.php"><?php echo __("Users")?></a></li>
99 
+					<li><a href="settings.php"><?php echo __("Settings")?></a></li>
100 
+					<li class="selected"><a><?php echo __("Options")?></a></li>
101 101 
 					</ul>
102 102 
 					<p>&nbsp;</p>
103 103 
 <?php

@@ -117,93 +117,93 @@ if ($user->isAdmin()) {
117 117 
 						<form action="options.php" method="post" id="options_form" autocomplete="off" class="newpost">
118 118 
 							<fieldset>
119 119 
 								<ul>
120 
-									<li><label for="rich_text"><?=__("Rich text editor:")?></label>
120 
+									<li><label for="rich_text"><?php echo __("Rich text editor:")?></label>
121 121 
 										<select name="rich_text" id="rich_text">
122 
-											<option value="1" <?php if($conf->richText) echo "selected"; ?>><?=__("Active")?></option>
123 
-											<option value="0" <?php if(!$conf->richText) echo "selected"; ?>><?=__("Deactive")?></option>
122 
+											<option value="1" <?php if($conf->richText) echo "selected"; ?>><?php echo __("Active")?></option>
123 
+											<option value="0" <?php if(!$conf->richText) echo "selected"; ?>><?php echo __("Deactive")?></option>
124 124 
 										</select>
125 125 
 									</li>
126 
-									<li><label for="url_friendly"><?=__("URL friendly:")?></label>
126 
+									<li><label for="url_friendly"><?php echo __("URL friendly:")?></label>
127 127 
 										<select name="url_friendly" id="url_friendly">
128 
-											<option value="1" <?php if($conf->urlFriendly) echo "selected"; ?>><?=__("Active")?></option>
129 
-											<option value="0" <?php if(!$conf->urlFriendly) echo "selected"; ?>><?=__("Deactive")?></option>
128 
+											<option value="1" <?php if($conf->urlFriendly) echo "selected"; ?>><?php echo __("Active")?></option>
129 
+											<option value="0" <?php if(!$conf->urlFriendly) echo "selected"; ?>><?php echo __("Deactive")?></option>
130 130 
 										</select>
131 131 
 									</li>
132 
-									<li><label for="allow_comments"><?=__("Allow readers comments:")?></label>
132 
+									<li><label for="allow_comments"><?php echo __("Allow readers comments:")?></label>
133 133 
 										<select name="allow_comments" id="allow_comments">
134 
-											<option value="1" <?php if($conf->allowComments) echo "selected"; ?>><?=__("Active")?></option>
135 
-											<option value="0" <?php if(!$conf->allowComments) echo "selected"; ?>><?=__("Deactive")?></option>
134 
+											<option value="1" <?php if($conf->allowComments) echo "selected"; ?>><?php echo __("Active")?></option>
135 
+											<option value="0" <?php if(!$conf->allowComments) echo "selected"; ?>><?php echo __("Deactive")?></option>
136 136 
 										</select>
137 137 
 									</li>
138 
-									<li><label for="time_offsets"><?=__("Time Offset:")?></label>
138 
+									<li><label for="time_offsets"><?php echo __("Time Offset:")?></label>
139 139 
 										<select id="time_offsets" name="time_offsets">
140 
-											<option value="-12,Pacific/Kwajalein" <?=($conf->offsetCity=="Pacific/Kwajalein")? "selected=\"selected\"":"" ?>>(GMT -12:00) International Date Line West</option>
141 
-											<option value="-11,Pacific/Samoa" <?=($conf->offsetCity=="Pacific/Samoa")? "selected=\"selected\"":"" ?>>(GMT -11:00) Midway Island, Samoa</option>
142 
-											<option value="-10,Pacific/Honolulu" <?=($conf->offsetCity=="Pacific/Honolulu")? "selected=\"selected\"":"" ?>>(GMT -10:00) Hawaii</option>
143 
-											<option value="-9,US/Alaska" <?=($conf->offsetCity=="US/Alaska")? "selected=\"selected\"":"" ?>>(GMT -9:00) Alaska</option>
144 
-											<option value="-8,US/Pacific" <?=($conf->offsetCity=="US/Pacific")? "selected=\"selected\"":"" ?>>(GMT -8:00) Pacific Time (US &amp; Canada); Tijuana</option>
145 
-											<option value="-7,US/Mountain" <?=($conf->offsetCity=="US/Mountain")? "selected=\"selected\"":"" ?>>(GMT -7:00) Mountain Time (US &amp; Canada)</option>
146 
-											<option value="-7,US/Arizona" <?=($conf->offsetCity=="US/Arizona")? "selected=\"selected\"":"" ?>>(GMT -7:00) Arizona</option>
147 
-											<option value="-7,Mexico/BajaNorte" <?=($conf->offsetCity=="Mexico/BajaNorte")? "selected=\"selected\"":"" ?>>(GMT -7:00) Chihuahua, La Paz, Mazatlan</option>
148 
-											<option value="-6,US/Central" <?=($conf->offsetCity=="US/Central")? "selected=\"selected\"":"" ?>>(GMT -6:00) Central Time (US &amp; Canada)</option>
149 
-											<option value="-6,America/Costa_Rica" <?=($conf->offsetCity=="America/Costa_Rica")? "selected=\"selected\"":"" ?>>(GMT -6:00) Central America</option>
150 
-											<option value="-6,Mexico/General" <?=($conf->offsetCity=="Mexico/General")? "selected=\"selected\"":"" ?>>(GMT -6:00) Guadalajara, Mexico City, Monterrey</option>
151 
-											<option value="-6,Canada/Saskatchewan" <?=($conf->offsetCity=="Canada/Saskatchewan")? "selected=\"selected\"":"" ?>>(GMT -6:00) Saskatchewan</option>
152 
-											<option value="-5,US/Eastern" <?=($conf->offsetCity=="US/Eastern")? "selected=\"selected\"":"" ?>>(GMT -5:00) Eastern Time (US &amp; Canada)</option>
153 
-											<option value="-5,America/Bogota" <?=($conf->offsetCity=="America/Bogota")? "selected=\"selected\"":"" ?>>(GMT -5:00) Bogota, Lima, Quito</option>
154 
-											<option value="-5,US/East-Indiana" <?=($conf->offsetCity=="US/East-Indiana")? "selected=\"selected\"":"" ?>>(GMT -5:00) Indiana (East)</option>
155 
-											<option value="-4,Canada/Eastern" <?=($conf->offsetCity=="Canada/Eastern")? "selected=\"selected\"":"" ?>>(GMT -4:00) Atlantic Time (Canada)</option>
156 
-											<option value="-4,America/Caracas" <?=($conf->offsetCity=="America/Caracas")? "selected=\"selected\"":"" ?>>(GMT -4:00) Caracas, La Paz</option>
157 
-											<option value="-4,America/Santiago" <?=($conf->offsetCity=="America/Santiago")? "selected=\"selected\"":"" ?>>(GMT -4:00) Santiago</option>
158 
-											<option value="-3.50,Canada/Newfoundland" <?=($conf->offsetCity=="Canada/Newfoundland")? "selected=\"selected\"":"" ?>>(GMT -3:30) Newfoundland</option>
159 
-											<option value="-3,Canada/Atlantic" <?=($conf->offsetCity=="Canada/Atlantic")? "selected=\"selected\"":"" ?>>(GMT -3:00) Brasilia, Greenland</option>
160 
-											<option value="-3,America/Buenos_Aires" <?=($conf->offsetCity=="America/Buenos_Aires")? "selected=\"selected\"":"" ?>>(GMT -3:00) Buenos Aires, Georgetown</option>
161 
-											<option value="-1,Atlantic/Cape_Verde" <?=($conf->offsetCity=="Atlantic/Cape_Verde")? "selected=\"selected\"":"" ?>>(GMT -1:00) Cape Verde Is.</option>
162 
-											<option value="-1,Atlantic/Azores" <?=($conf->offsetCity=="Atlantic/Azores")? "selected=\"selected\"":"" ?>>(GMT -1:00) Azores</option>
163 
-											<option value="0,Africa/Casablanca" <?=($conf->offsetCity=="Africa/Casablanca")? "selected=\"selected\"":"" ?>>(GMT) Casablanca, Monrovia</option>
164 
-											<option value="0,Europe/Dublin" <?=($conf->offsetCity=="Europe/Dublin")? "selected=\"selected\"":"" ?>>(GMT) Greenwich Mean Time : Dublin, Edinburgh, London</option>
165 
-											<option value="1,Europe/Amsterdam" <?=($conf->offsetCity=="Europe/Amsterdam")? "selected=\"selected\"":"" ?>>(GMT +1:00) Amsterdam, Berlin, Rome, Stockholm, Vienna</option>
166 
-											<option value="1,Europe/Prague" <?=($conf->offsetCity=="Europe/Pragu")? "selected=\"selected\"":"" ?>>(GMT +1:00) Belgrade, Bratislava, Budapest, Prague</option>
167 
-											<option value="1,Europe/Paris" <?=($conf->offsetCity=="Europe/Paris")? "selected=\"selected\"":"" ?>>(GMT +1:00) Brussels, Copenhagen, Madrid, Paris</option>
168 
-											<option value="1,Europe/Warsaw" <?=($conf->offsetCity=="Europe/Warsaw")? "selected=\"selected\"":"" ?>>(GMT +1:00) Sarajevo, Skopje, Warsaw, Zagreb</option>
169 
-											<option value="1,Africa/Bangui" <?=($conf->offsetCity=="Africa/Bangui")? "selected=\"selected\"":"" ?>>(GMT +1:00) West Central Africa</option>
170 
-											<option value="2,Europe/Istanbul" <?=($conf->offsetCity=="Europe/Istanbul")? "selected=\"selected\"":"" ?>>(GMT +2:00) Athens, Beirut, Bucharest, Cairo, Istanbul	</option>
171 
-											<option value="2,Asia/Jerusalem" <?=($conf->offsetCity=="Asia/Jerusalem")? "selected=\"selected\"":"" ?>>(GMT +2:00) Harare, Jerusalem, Pretoria</option>
172 
-											<option value="2,Europe/Kiev" <?=($conf->offsetCity=="Europe/Kiev")? "selected=\"selected\"":"" ?>>(GMT +2:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius</option>
173 
-											<option value="3,Asia/Riyadh" <?=($conf->offsetCity=="Asia/Riyadh")? "selected=\"selected\"":"" ?>>(GMT +3:00) Kuwait, Nairobi, Riyadh</option>
174 
-											<option value="3,Europe/Moscow" <?=($conf->offsetCity=="Europe/Moscow")? "selected=\"selected\"":"" ?>>(GMT +3:00) Baghdad, Moscow, St. Petersburg, Volgograd</option>
175 
-											<option value="3.50,Asia/Tehran" <?=($conf->offsetCity=="Asia/Tehran")? "selected=\"selected\"":"" ?>>(GMT +3:30) Tehran</option>
176 
-											<option value="4,Asia/Muscat" <?=($conf->offsetCity=="Asia/Muscat")? "selected=\"selected\"":"" ?>>(GMT +4:00) Abu Dhabi, Muscat</option>
177 
-											<option value="4,Asia/Baku" <?=($conf->offsetCity=="Asia/Baku")? "selected=\"selected\"":"" ?>>(GMT +4:00) Baku, Tbilsi, Yerevan</option>
178 
-											<option value="4.50,Asia/Kabul" <?=($conf->offsetCity=="Asia/Kabul")? "selected=\"selected\"":"" ?>>(GMT +4:30) Kabul</option>
179 
-											<option value="5,Asia/Yekaterinburg" <?=($conf->offsetCity=="Asia/Yekaterinburg")? "selected=\"selected\"":"" ?>>(GMT +5:00) Yekaterinburg</option>
180 
-											<option value="5,Asia/Karachi" <?=($conf->offsetCity=="Asia/Karachi")? "selected=\"selected\"":"" ?>>(GMT +5:00) Islamabad, Karachi, Tashkent</option>
181 
-											<option value="5.50,Asia/Calcutta" <?=($conf->offsetCity=="Asia/Calcutta")? "selected=\"selected\"":"" ?>>(GMT +5:30) Chennai, Calcutta, Mumbai, New Delhi</option>
182 
-											<option value="5.75,Asia/Katmandu" <?=($conf->offsetCity=="Asia/Katmandu")? "selected=\"selected\"":"" ?>>(GMT +5:45) Katmandu</option>
183 
-											<option value="6,Asia/Almaty" <?=($conf->offsetCity=="Asia/Almaty")? "selected=\"selected\"":"" ?>>(GMT +6:00) Almaty, Novosibirsk</option>
184 
-											<option value="6,Asia/Dhaka" <?=($conf->offsetCity=="Asia/Dhaka")? "selected=\"selected\"":"" ?>>(GMT +6:00) Astana, Dhaka, Sri Jayawardenepura</option>
185 
-											<option value="6.50,Asia/Rangoon" <?=($conf->offsetCity=="Asia/Rangoo")? "selected=\"selected\"":"" ?>>(GMT +6:30) Rangoon</option>
186 
-											<option value="7,Asia/Bangkok" <?=($conf->offsetCity=="Asia/Bangkok")? "selected=\"selected\"":"" ?>>(GMT +7:00) Bangkok, Hanoi, Jakarta</option>
187 
-											<option value="7,Asia/Krasnoyarsk" <?=($conf->offsetCity=="Asia/Krasnoyarsk")? "selected=\"selected\"":"" ?>>(GMT +7:00) Krasnoyarsk</option>
188 
-											<option value="8,Asia/Hong_Kong" <?=($conf->offsetCity=="Asia/Hong_Kong")? "selected=\"selected\"":"" ?>>(GMT +8:00) Beijing, Chongqing, Hong Kong, Urumqi</option>
189 
-											<option value="8,Asia/Irkutsk" <?=($conf->offsetCity=="Asia/Irkutsk")? "selected=\"selected\"":"" ?>>(GMT +8:00) Irkutsk, Ulaan Bataar</option>
190 
-											<option value="8,Asia/Singapore" <?=($conf->offsetCity=="Asia/Singapore")? "selected=\"selected\"":"" ?>>(GMT +8:00) Kuala Lumpar, Perth, Singapore, Taipei</option>
191 
-											<option value="9,Asia/Tokyo" <?=($conf->offsetCity=="Asia/Tokyo")? "selected=\"selected\"":"" ?>>(GMT +9:00) Osaka, Sapporo, Tokyo</option>
192 
-											<option value="9,Asia/Seoul" <?=($conf->offsetCity=="Asia/Seoul")? "selected=\"selected\"":"" ?>>(GMT +9:00) Seoul</option>
193 
-											<option value="9,Asia/Yakutsk" <?=($conf->offsetCity=="Asia/Yakutsk")? "selected=\"selected\"":"" ?>>(GMT +9:00) Yakutsk</option>
194 
-											<option value="9.50,Australia/Adelaide" <?=($conf->offsetCity=="Australia/Adelaide")? "selected=\"selected\"":"" ?>>(GMT +9:30) Adelaide</option>
195 
-											<option value="9.50,Australia/Darwin" <?=($conf->offsetCity=="Australia/Darwin")? "selected=\"selected\"":"" ?>>(GMT +9:30) Darwin</option>
196 
-											<option value="10,Australia/Brisbane" <?=($conf->offsetCity=="Australia/Brisbane")? "selected=\"selected\"":"" ?>>(GMT +10:00) Brisbane, Guam, Port Moresby</option>
197 
-											<option value="10,Australia/Canberra" <?=($conf->offsetCity=="Australia/Canberra")? "selected=\"selected\"":"" ?>>(GMT +10:00) Canberra, Hobart, Melbourne, Sydney, Vladivostok</option>
198 
-											<option value="11,Asia/Magadan" <?=($conf->offsetCity=="Asia/Magadan")? "selected=\"selected\"":"" ?>>(GMT +11:00) Magadan, Soloman Is., New Caledonia</option>
199 
-											<option value="12,Pacific/Auckland" <?=($conf->offsetCity=="Pacific/Auckland")? "selected=\"selected\"":"" ?>>(GMT +12:00) Auckland, Wellington</option>
200 
-											<option value="12,Pacific/Fiji" <?=($conf->offsetCity=="Pacific/Fiji")? "selected=\"selected\"":"" ?>>(GMT +12:00) Fiji, Kamchatka, Marshall Is.</option>
140 
+											<option value="-12,Pacific/Kwajalein" <?php echo ($conf->offsetCity=="Pacific/Kwajalein")? "selected=\"selected\"":"" ?>>(GMT -12:00) International Date Line West</option>
141 
+											<option value="-11,Pacific/Samoa" <?php echo ($conf->offsetCity=="Pacific/Samoa")? "selected=\"selected\"":"" ?>>(GMT -11:00) Midway Island, Samoa</option>
142 
+											<option value="-10,Pacific/Honolulu" <?php echo ($conf->offsetCity=="Pacific/Honolulu")? "selected=\"selected\"":"" ?>>(GMT -10:00) Hawaii</option>
143 
+											<option value="-9,US/Alaska" <?php echo ($conf->offsetCity=="US/Alaska")? "selected=\"selected\"":"" ?>>(GMT -9:00) Alaska</option>
144 
+											<option value="-8,US/Pacific" <?php echo ($conf->offsetCity=="US/Pacific")? "selected=\"selected\"":"" ?>>(GMT -8:00) Pacific Time (US &amp; Canada); Tijuana</option>
145 
+											<option value="-7,US/Mountain" <?php echo ($conf->offsetCity=="US/Mountain")? "selected=\"selected\"":"" ?>>(GMT -7:00) Mountain Time (US &amp; Canada)</option>
146 
+											<option value="-7,US/Arizona" <?php echo ($conf->offsetCity=="US/Arizona")? "selected=\"selected\"":"" ?>>(GMT -7:00) Arizona</option>
147 
+											<option value="-7,Mexico/BajaNorte" <?php echo ($conf->offsetCity=="Mexico/BajaNorte")? "selected=\"selected\"":"" ?>>(GMT -7:00) Chihuahua, La Paz, Mazatlan</option>
148 
+											<option value="-6,US/Central" <?php echo ($conf->offsetCity=="US/Central")? "selected=\"selected\"":"" ?>>(GMT -6:00) Central Time (US &amp; Canada)</option>
149 
+											<option value="-6,America/Costa_Rica" <?php echo ($conf->offsetCity=="America/Costa_Rica")? "selected=\"selected\"":"" ?>>(GMT -6:00) Central America</option>
150 
+											<option value="-6,Mexico/General" <?php echo ($conf->offsetCity=="Mexico/General")? "selected=\"selected\"":"" ?>>(GMT -6:00) Guadalajara, Mexico City, Monterrey</option>
151 
+											<option value="-6,Canada/Saskatchewan" <?php echo ($conf->offsetCity=="Canada/Saskatchewan")? "selected=\"selected\"":"" ?>>(GMT -6:00) Saskatchewan</option>
152 
+											<option value="-5,US/Eastern" <?php echo ($conf->offsetCity=="US/Eastern")? "selected=\"selected\"":"" ?>>(GMT -5:00) Eastern Time (US &amp; Canada)</option>
153 
+											<option value="-5,America/Bogota" <?php echo ($conf->offsetCity=="America/Bogota")? "selected=\"selected\"":"" ?>>(GMT -5:00) Bogota, Lima, Quito</option>
154 
+											<option value="-5,US/East-Indiana" <?php echo ($conf->offsetCity=="US/East-Indiana")? "selected=\"selected\"":"" ?>>(GMT -5:00) Indiana (East)</option>
155 
+											<option value="-4,Canada/Eastern" <?php echo ($conf->offsetCity=="Canada/Eastern")? "selected=\"selected\"":"" ?>>(GMT -4:00) Atlantic Time (Canada)</option>
156 
+											<option value="-4,America/Caracas" <?php echo ($conf->offsetCity=="America/Caracas")? "selected=\"selected\"":"" ?>>(GMT -4:00) Caracas, La Paz</option>
157 
+											<option value="-4,America/Santiago" <?php echo ($conf->offsetCity=="America/Santiago")? "selected=\"selected\"":"" ?>>(GMT -4:00) Santiago</option>
158 
+											<option value="-3.50,Canada/Newfoundland" <?php echo ($conf->offsetCity=="Canada/Newfoundland")? "selected=\"selected\"":"" ?>>(GMT -3:30) Newfoundland</option>
159 
+											<option value="-3,Canada/Atlantic" <?php echo ($conf->offsetCity=="Canada/Atlantic")? "selected=\"selected\"":"" ?>>(GMT -3:00) Brasilia, Greenland</option>
160 
+											<option value="-3,America/Buenos_Aires" <?php echo ($conf->offsetCity=="America/Buenos_Aires")? "selected=\"selected\"":"" ?>>(GMT -3:00) Buenos Aires, Georgetown</option>
161 
+											<option value="-1,Atlantic/Cape_Verde" <?php echo ($conf->offsetCity=="Atlantic/Cape_Verde")? "selected=\"selected\"":"" ?>>(GMT -1:00) Cape Verde Is.</option>
162 
+											<option value="-1,Atlantic/Azores" <?php echo ($conf->offsetCity=="Atlantic/Azores")? "selected=\"selected\"":"" ?>>(GMT -1:00) Azores</option>
163 
+											<option value="0,Africa/Casablanca" <?php echo ($conf->offsetCity=="Africa/Casablanca")? "selected=\"selected\"":"" ?>>(GMT) Casablanca, Monrovia</option>
164 
+											<option value="0,Europe/Dublin" <?php echo ($conf->offsetCity=="Europe/Dublin")? "selected=\"selected\"":"" ?>>(GMT) Greenwich Mean Time : Dublin, Edinburgh, London</option>
165 
+											<option value="1,Europe/Amsterdam" <?php echo ($conf->offsetCity=="Europe/Amsterdam")? "selected=\"selected\"":"" ?>>(GMT +1:00) Amsterdam, Berlin, Rome, Stockholm, Vienna</option>
166 
+											<option value="1,Europe/Prague" <?php echo ($conf->offsetCity=="Europe/Pragu")? "selected=\"selected\"":"" ?>>(GMT +1:00) Belgrade, Bratislava, Budapest, Prague</option>
167 
+											<option value="1,Europe/Paris" <?php echo ($conf->offsetCity=="Europe/Paris")? "selected=\"selected\"":"" ?>>(GMT +1:00) Brussels, Copenhagen, Madrid, Paris</option>
168 
+											<option value="1,Europe/Warsaw" <?php echo ($conf->offsetCity=="Europe/Warsaw")? "selected=\"selected\"":"" ?>>(GMT +1:00) Sarajevo, Skopje, Warsaw, Zagreb</option>
169 
+											<option value="1,Africa/Bangui" <?php echo ($conf->offsetCity=="Africa/Bangui")? "selected=\"selected\"":"" ?>>(GMT +1:00) West Central Africa</option>
170 
+											<option value="2,Europe/Istanbul" <?php echo ($conf->offsetCity=="Europe/Istanbul")? "selected=\"selected\"":"" ?>>(GMT +2:00) Athens, Beirut, Bucharest, Cairo, Istanbul	</option>
171 
+											<option value="2,Asia/Jerusalem" <?php echo ($conf->offsetCity=="Asia/Jerusalem")? "selected=\"selected\"":"" ?>>(GMT +2:00) Harare, Jerusalem, Pretoria</option>
172 
+											<option value="2,Europe/Kiev" <?php echo ($conf->offsetCity=="Europe/Kiev")? "selected=\"selected\"":"" ?>>(GMT +2:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius</option>
173 
+											<option value="3,Asia/Riyadh" <?php echo ($conf->offsetCity=="Asia/Riyadh")? "selected=\"selected\"":"" ?>>(GMT +3:00) Kuwait, Nairobi, Riyadh</option>
174 
+											<option value="3,Europe/Moscow" <?php echo ($conf->offsetCity=="Europe/Moscow")? "selected=\"selected\"":"" ?>>(GMT +3:00) Baghdad, Moscow, St. Petersburg, Volgograd</option>
175 
+											<option value="3.50,Asia/Tehran" <?php echo ($conf->offsetCity=="Asia/Tehran")? "selected=\"selected\"":"" ?>>(GMT +3:30) Tehran</option>
176 
+											<option value="4,Asia/Muscat" <?php echo ($conf->offsetCity=="Asia/Muscat")? "selected=\"selected\"":"" ?>>(GMT +4:00) Abu Dhabi, Muscat</option>
177 
+											<option value="4,Asia/Baku" <?php echo ($conf->offsetCity=="Asia/Baku")? "selected=\"selected\"":"" ?>>(GMT +4:00) Baku, Tbilsi, Yerevan</option>
178 
+											<option value="4.50,Asia/Kabul" <?php echo ($conf->offsetCity=="Asia/Kabul")? "selected=\"selected\"":"" ?>>(GMT +4:30) Kabul</option>
179 
+											<option value="5,Asia/Yekaterinburg" <?php echo ($conf->offsetCity=="Asia/Yekaterinburg")? "selected=\"selected\"":"" ?>>(GMT +5:00) Yekaterinburg</option>
180 
+											<option value="5,Asia/Karachi" <?php echo ($conf->offsetCity=="Asia/Karachi")? "selected=\"selected\"":"" ?>>(GMT +5:00) Islamabad, Karachi, Tashkent</option>
181 
+											<option value="5.50,Asia/Calcutta" <?php echo ($conf->offsetCity=="Asia/Calcutta")? "selected=\"selected\"":"" ?>>(GMT +5:30) Chennai, Calcutta, Mumbai, New Delhi</option>
182 
+											<option value="5.75,Asia/Katmandu" <?php echo ($conf->offsetCity=="Asia/Katmandu")? "selected=\"selected\"":"" ?>>(GMT +5:45) Katmandu</option>
183 
+											<option value="6,Asia/Almaty" <?php echo ($conf->offsetCity=="Asia/Almaty")? "selected=\"selected\"":"" ?>>(GMT +6:00) Almaty, Novosibirsk</option>
184 
+											<option value="6,Asia/Dhaka" <?php echo ($conf->offsetCity=="Asia/Dhaka")? "selected=\"selected\"":"" ?>>(GMT +6:00) Astana, Dhaka, Sri Jayawardenepura</option>
185 
+											<option value="6.50,Asia/Rangoon" <?php echo ($conf->offsetCity=="Asia/Rangoo")? "selected=\"selected\"":"" ?>>(GMT +6:30) Rangoon</option>
186 
+											<option value="7,Asia/Bangkok" <?php echo ($conf->offsetCity=="Asia/Bangkok")? "selected=\"selected\"":"" ?>>(GMT +7:00) Bangkok, Hanoi, Jakarta</option>
187 
+											<option value="7,Asia/Krasnoyarsk" <?php echo ($conf->offsetCity=="Asia/Krasnoyarsk")? "selected=\"selected\"":"" ?>>(GMT +7:00) Krasnoyarsk</option>
188 
+											<option value="8,Asia/Hong_Kong" <?php echo ($conf->offsetCity=="Asia/Hong_Kong")? "selected=\"selected\"":"" ?>>(GMT +8:00) Beijing, Chongqing, Hong Kong, Urumqi</option>
189 
+											<option value="8,Asia/Irkutsk" <?php echo ($conf->offsetCity=="Asia/Irkutsk")? "selected=\"selected\"":"" ?>>(GMT +8:00) Irkutsk, Ulaan Bataar</option>
190 
+											<option value="8,Asia/Singapore" <?php echo ($conf->offsetCity=="Asia/Singapore")? "selected=\"selected\"":"" ?>>(GMT +8:00) Kuala Lumpar, Perth, Singapore, Taipei</option>
191 
+											<option value="9,Asia/Tokyo" <?php echo ($conf->offsetCity=="Asia/Tokyo")? "selected=\"selected\"":"" ?>>(GMT +9:00) Osaka, Sapporo, Tokyo</option>
192 
+											<option value="9,Asia/Seoul" <?php echo ($conf->offsetCity=="Asia/Seoul")? "selected=\"selected\"":"" ?>>(GMT +9:00) Seoul</option>
193 
+											<option value="9,Asia/Yakutsk" <?php echo ($conf->offsetCity=="Asia/Yakutsk")? "selected=\"selected\"":"" ?>>(GMT +9:00) Yakutsk</option>
194 
+											<option value="9.50,Australia/Adelaide" <?php echo ($conf->offsetCity=="Australia/Adelaide")? "selected=\"selected\"":"" ?>>(GMT +9:30) Adelaide</option>
195 
+											<option value="9.50,Australia/Darwin" <?php echo ($conf->offsetCity=="Australia/Darwin")? "selected=\"selected\"":"" ?>>(GMT +9:30) Darwin</option>
196 
+											<option value="10,Australia/Brisbane" <?php echo ($conf->offsetCity=="Australia/Brisbane")? "selected=\"selected\"":"" ?>>(GMT +10:00) Brisbane, Guam, Port Moresby</option>
197 
+											<option value="10,Australia/Canberra" <?php echo ($conf->offsetCity=="Australia/Canberra")? "selected=\"selected\"":"" ?>>(GMT +10:00) Canberra, Hobart, Melbourne, Sydney, Vladivostok</option>
198 
+											<option value="11,Asia/Magadan" <?php echo ($conf->offsetCity=="Asia/Magadan")? "selected=\"selected\"":"" ?>>(GMT +11:00) Magadan, Soloman Is., New Caledonia</option>
199 
+											<option value="12,Pacific/Auckland" <?php echo ($conf->offsetCity=="Pacific/Auckland")? "selected=\"selected\"":"" ?>>(GMT +12:00) Auckland, Wellington</option>
200 
+											<option value="12,Pacific/Fiji" <?php echo ($conf->offsetCity=="Pacific/Fiji")? "selected=\"selected\"":"" ?>>(GMT +12:00) Fiji, Kamchatka, Marshall Is.</option>
201 201 
 										</select>
202 202 
 									</li>
203 203 
 								</ul>
204 204 
 							</fieldset>
205 205 
 							<p>
206 
-								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?=__("Modify")?>" class="submit"/>
206 
+								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?php echo __("Modify")?>" class="submit"/>
207 207 
 							</p>
208 208 
 						</form>
209 209

+ 16 - 16
admin/settings.php Datei anzeigen 

@@ -32,7 +32,7 @@ if ($user->isAdmin()) {
32 32 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
33 33 
 	<html xmlns="http://www.w3.org/1999/xhtml">
34 34 
 	<head>
35 
-		<title>gelato :: <?=__("settings")?></title>
35 
+		<title>gelato :: <?php echo __("settings")?></title>
36 36 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
37 37 
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
38 38 
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />

@@ -55,23 +55,23 @@ if ($user->isAdmin()) {
55 55 
 	</head>
56 56
57 57 
 	<body>
58 
-		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
58 
+		<div id="div-process" style="display:none;"><?php echo __("Processing request...")?></div>
59 59 
 		<div id="cont">
60 60 
 			<div id="head">
61 
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
61 
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
62 62 
 				<ul id="nav">
63 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
63 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
64 64 
 			  	</ul>
65 65 
 			</div>
66 66 
 			<div id="main">
67 67
68 68 
 				<div class="box">
69 69 
 					<ul class="menu manage">
70 
-					<h3><?=__("Tumblelog configuration")?></h3>
71 
-					<li><a href="index.php"><?=__("Post")?></a></li>
72 
-					<li><a href="admin.php"><?=__("Users")?></a></li>
73 
-					<li><a href="options.php"><?=__("Options")?></a></li>
74 
-					<li class="selected"><a><?=__("Settings")?></a></li>
70 
+					<h3><?php echo __("Tumblelog configuration")?></h3>
71 
+					<li><a href="index.php"><?php echo __("Post")?></a></li>
72 
+					<li><a href="admin.php"><?php echo __("Users")?></a></li>
73 
+					<li><a href="options.php"><?php echo __("Options")?></a></li>
74 
+					<li class="selected"><a><?php echo __("Settings")?></a></li>
75 75 
 					</ul>
76 76 
 					<p>&nbsp;</p>
77 77 
 <?php

@@ -91,15 +91,15 @@ if ($user->isAdmin()) {
91 91 
 						<form action="settings.php" method="post" id="settings_form" autocomplete="off" class="newpost">
92 92 
 							<fieldset>
93 93 
 								<ul>
94 
-									<li><label for="title"><?=__("Title:")?></label>
94 
+									<li><label for="title"><?php echo __("Title:")?></label>
95 95 
 										<input type="text" name="title" id="title" value="<?php echo $conf->title;?>" class="txt"/></li>
96 
-									<li><label for="description"><?=__("Description:")?></label>
96 
+									<li><label for="description"><?php echo __("Description:")?></label>
97 97 
 										<input type="text" name="description" id="description" value="<?php echo $conf->description;?>" class="txt"/></li>
98 
-									<li><label for="url_installation"><?=__("Installation URL")?></label>
98 
+									<li><label for="url_installation"><?php echo __("Installation URL")?></label>
99 99 
 										<input type="text" name="url_installation" id="url_installation" value="<?php echo $conf->urlGelato;?>" class="txt"/></li>
100 
-									<li><label for="posts_limit"><?=__("Post limit:")?></label>
100 
+									<li><label for="posts_limit"><?php echo __("Post limit:")?></label>
101 101 
 										<input type="text" name="posts_limit" id="posts_limit" value="<?php echo $conf->postLimit;?>" class="txt"/></li>
102 
-									<li><label for="lang"><?=__("Language:")?></label>
102 
+									<li><label for="lang"><?php echo __("Language:")?></label>
103 103 
 										<select id="lang" name="lang">
104 104 
 <?php
105 105 
 										$langs = getLangs();

@@ -111,7 +111,7 @@ if ($user->isAdmin()) {
111 111 
 ?>
112 112 
 										</select>
113 113 
 									</li>
114 
-									<li><label for="template"><?=__("Template:")?></label>
114 
+									<li><label for="template"><?php echo __("Template:")?></label>
115 115 
 										<select id="template" name="template">
116 116 
 <?php
117 117 
 										$themes = getThemes();

@@ -126,7 +126,7 @@ if ($user->isAdmin()) {
126 126 
 								</ul>
127 127 
 							</fieldset>
128 128 
 							<p>
129 
-								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?=__("Modify")?>" class="submit"/>
129 
+								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?php echo __("Modify")?>" class="submit"/>
130 130 
 							</p>
131 131 
 						</form>
132 132

+ 13 - 13
admin/user.php Datei anzeigen 

@@ -65,21 +65,21 @@ if ($user->isAdmin()) {
65 65 
 	</head>
66 66
67 67 
 	<body>
68 
-		<div id="div-process" style="display:none;"><?=__("Processing request...");?></div>
68 
+		<div id="div-process" style="display:none;"><?php echo __("Processing request...");?></div>
69 69 
 		<div id="cont">
70 70 
 			<div id="head">
71 
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
71 
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
72 72 
 				<ul id="nav">
73 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
73 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
74 74 
 			  	</ul>
75 75 
 			</div>
76 76 
 			<div id="main">
77 77
78 78 
 				<div class="box">
79 79 
 					<ul class="menu manage">
80 
-					<h3><?=__("Start session")?></h3>
81 
-					<li><a href="index.php"><?=__("Post")?></a></li>
82 
-					<li><a href="admin.php"><?=__("Users")?></a></li>
80 
+					<h3><?php echo __("Start session")?></h3>
81 
+					<li><a href="index.php"><?php echo __("Post")?></a></li>
82 
+					<li><a href="admin.php"><?php echo __("Users")?></a></li>
83 83 
 					<li class="selected"><a><?php echo ($isEdition) ? __("Edit") : __("Add"); ?></a></li>
84 84 
 					</ul>
85 85 
 				

@@ -96,7 +96,7 @@ if ($user->isAdmin()) {
96 96 
 							}
97 97 
 ?>
98 98 
 							<li>
99 
-								<label for="login"><?=__("user:")?></label>
99 
+								<label for="login"><?php echo __("user:")?></label>
100 100 
 									<input class="txt" name="login" id="login" type="text" autocomplete="off" value="<?php echo isset($register["login"])?$register["login"]:"";?>" />
101 101 
 <?php
102 102 
 							if (!$isEdition) {

@@ -112,27 +112,27 @@ if ($user->isAdmin()) {
112 112 
 								<div id="target" style="display:none;"></div>
113 113 
 							</li>
114 114 
 							<li>
115 
-								<label for="pass"><?=__("password:")?></label>
115 
+								<label for="pass"><?php echo __("password:")?></label>
116 116 
 									<input class="txt" name="password" id="password" type="password" />
117 117 
 							</li>
118 118 
 							<li>
119 
-								<label for="repass"><?=__("retype password:")?></label>
119 
+								<label for="repass"><?php echo __("retype password:")?></label>
120 120 
 									<input class="txt" name="repass" id="repass" type="password" />
121 121 
 							</li>
122 122 
 							<li>
123 
-								<label for="name"><?=__("name:")?></label>
123 
+								<label for="name"><?php echo __("name:")?></label>
124 124 
 									<input class="txt" name="name" id="name" type="text" value="<?php echo isset($register["name"])?$register["name"]:"";?>" />
125 125 
 							</li>
126 126 
 							<li>
127 
-								<label for="email"><?=__("e-mail:")?></label>
127 
+								<label for="email"><?php echo __("e-mail:")?></label>
128 128 
 									<input class="txt" name="email" id="email" type="text" value="<?php echo isset($register["email"])?$register["email"]:"";?>" />
129 129 
 							</li>
130 130 
 							<li>
131 
-								<label for="website"><?=__("website:")?></label>
131 
+								<label for="website"><?php echo __("website:")?></label>
132 132 
 									<input class="txt" name="website" id="website" type="text" value="<?php echo isset($register["website"])?$register["website"]:"";?>" />
133 133 
 							</li>
134 134 
 							<li>
135 
-								<label for="about"><?=__("about:")?></label><br />
135 
+								<label for="about"><?php echo __("about:")?></label><br />
136 136 
 									<textarea rows="5" cols="50" name="about" id="about" tabindex="7"><?php echo isset($register["about"])?$register["about"]:"";?></textarea>
137 137 
 							</li>
138 138 
 							<li>

+ 14 - 11
login.php Datei anzeigen 

@@ -19,6 +19,9 @@ require_once(dirname(__FILE__)."/classes/configuration.class.php");
19 19
20 20 
 $user = new user();
21 21 
 $conf = new configuration();
22 
+
23 
+die($user->validateUser($_POST['login'], md5($_POST['pass']))."<");
24 
+
22 25 
 if ($user->isAdmin()) {
23 26 
 	header("Location: ".$conf->urlGelato."/admin/index.php");
24 27 
 } else {

@@ -34,7 +37,7 @@ if ($user->isAdmin()) {
34 37 
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
35 38 
 	<html xmlns="http://www.w3.org/1999/xhtml">
36 39 
 	<head>
37 
-		<title>gelato :: <?=__("login screen")?></title>
40 
+		<title>gelato :: <?php echo __("login screen")?></title>
38 41 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
39 42 
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
40 43 
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />

@@ -46,20 +49,20 @@ if ($user->isAdmin()) {
46 49 
 	</head>
47 50
48 51 
 	<body>
49 
-		<div id="div-process" style="display:none;"><?=__("Processing request...")?></div>
52 
+		<div id="div-process" style="display:none;"><?php echo __("Processing request...")?></div>
50 53 
 		<div id="cont">
51 54 
 			<div id="head">
52 
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
55 
+				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
53 56 
 				<ul id="nav">
54 
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
57 
+					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
55 58 
 			  	</ul>
56 59 
 			</div>
57 60 
 			<div id="main">
58 61
59 62 
 				<div class="box">
60 63 
 					<ul class="menu manage">
61 
-					<h3><?=__("Start session")?></h3>
62 
-					<li class="selected"><a><?=__("Login")?></a></li>
64 
+					<h3><?php echo __("Start session")?></h3>
65 
+					<li class="selected"><a><?php echo __("Login")?></a></li>
63 66 
 					</ul>
64 67
65 68 
 					<div class="tabla">

@@ -67,11 +70,11 @@ if ($user->isAdmin()) {
67 70 
 								<form action="login.php" method="post" id="valida" autocomplete="off" class="newpost">
68 71 
 									<fieldset>
69 72 
 									<ul>
70 
-										<li><label for="login"><?=__("User:")?></label>
73 
+										<li><label for="login"><?php echo __("User:")?></label>
71 74 
 											<input id="login" name="login" type="text" class="txt" /></li>
72 
-										<li><label for="pass"><?=__("Password:")?></label>
75 
+										<li><label for="pass"><?php echo __("Password:")?></label>
73 76 
 											<input id="pass" name="pass" type="password" class="txt" /></li>
74 
-										<li><label for="save_pass"><?=__("Remember me:")?></label>
77 
+										<li><label for="save_pass"><?php echo __("Remember me:")?></label>
75 78 
 											<input id="save_pass" name="save_pass" type="checkbox" /></li>
76 79 
 										<li><input name="btnLogin" type="submit" value="Login" /></li>
77 80 
 									</ul>

@@ -82,14 +85,14 @@ if ($user->isAdmin()) {
82 85 
 									if ($_GET["error"]==1) {
83 86 
 ?>
84 87 
 								<div class="error">
85 
-									<?=__("&nbsp;You must be registered to use gelato.")?>
88 
+									<?php echo __("&nbsp;You must be registered to use gelato.")?>
86 89 
 								</div>
87 90 
 <?php
88 91 
 									}
89 92 
 									elseif ($_GET["error"]==2) {
90 93 
 ?>
91 94 
 								<div class="error">
92 
-									<?=__("&nbsp;You must be logged on the system.")?>
95 
+									<?php echo __("&nbsp;You must be logged on the system.")?>
93 96 
 								</div>
94 97 
 <?php
95 98 
 									}