Browse code

update header + graphical fix

Simona Francini authored on 2017/03/23 14:42:58 • Jimako committed on 2019/10/30 05:38:31
Showing 1 changed files
... ...
@@ -1,4 +1,5 @@
1 1
 <?php
2
+header('Content-type: text/html; charset=UTF-8');
2 3
 // ----------------------------------------------------------------------
3 4
 // Copyright (c) 2007 by Tammy Keefer
4 5
 // Based on eFiction 1.1
... ...
@@ -64,7 +65,6 @@ if(ini_get('register_globals')) {
64 65
 Header('Cache-Control: private, no-cache, must-revalidate, max_age=0, post-check=0, pre-check=0');
65 66
 header ("Pragma: no-cache"); 
66 67
 header ("Expires: 0"); 
67
-header("Content-Type: text/html; charset="._CHARSET);
68 68
 
69 69
 // Locate config.php and set the basedir path
70 70
 $folder_level = "";
... ...
@@ -205,7 +205,7 @@ if($current == "viewstory"){
205 205
 		$filename = basename($titleinfo.".html");
206 206
 		$ie = strpos("msie", strtolower($_SERVER['HTTP_USER_AGENT'])) !== false ? true : false;
207 207
 		if ($ie) $filename = rawurlencode($filename);
208
-		header("Content-Disposition: inline; filename=\"".$titleinfo."\"");
208
+		//header("Content-Disposition: inline; filename=\"".$titleinfo."\"");
209 209
  	}
210 210
 }
211 211
 if($current == "viewuser" && isNumber($uid)) {
... ...
@@ -217,12 +217,13 @@ echo _DOCTYPE."<html><head>";
217 217
 if(!isset($titleinfo)) $titleinfo = "$sitename :: $slogan";
218 218
 if(isset($metaDesc)) echo "<meta name='description' content='$metaDesc'>";
219 219
 echo "<title>$titleinfo</title>
220
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset="._CHARSET."\">";
220
+<link rel=\"shortcut icon\" type=\"image/ico\" href=\"skins/Snow White/images/favicon.ico\" />
221
+<meta http-equiv=\"Content-Type\" content=\"text/html; charset=\"UTF-8\">";
221 222
 if(!isset($_GET['action']) || $_GET['action'] != "printable") {
222 223
 echo "<script language=\"javascript\" type=\"text/javascript\" src=\""._BASEDIR."includes/javascript.js\"></script>
223 224
 <link rel=\"alternate\" type=\"application/rss+xml\" title=\"$sitename RSS Feed\" href=\""._BASEDIR."rss.php\">";
224 225
 if(!empty($tinyMCE)) {
225
-	echo "<script language=\"javascript\" type=\"text/javascript\" src=\""._BASEDIR."tinymce/jscripts/tiny_mce/tiny_mce.js\"></script>
226
+	echo "<script language=\"javascript\" type=\"text/javascript\" src=\""._BASEDIR."tinymce/js/tinymce/tinymce.min.js\"></script>
226 227
 	<script language=\"javascript\" type=\"text/javascript\"><!--";
227 228
 	$tinymessage = dbquery("SELECT message_text FROM ".TABLEPREFIX."fanfiction_messages WHERE message_name = 'tinyMCE' LIMIT 1");
228 229
 	list($tinysettings) = dbrow($tinymessage);
... ...
@@ -231,28 +232,39 @@ if(!empty($tinyMCE)) {
231 232
 	}
232 233
 	else {
233 234
 		echo "
234
-	tinyMCE.init({ 
235
-		theme: 'advanced',
236
-		height: '250',
235
+	tinymce.init({
236
+  		selector: 'textarea:not(.mceNoEditor)',
237
+  		menubar: false,
237 238
 		language: '$language',
238
-		convert_urls: 'false',
239
-		mode: 'textareas',
240
-		extended_valid_elements: 'a[name|href|target|title]',
241
-		plugins: 'advhr,advimage,advlink,searchreplace,contextmenu,preview,fullscreen,paste".($current == "adminarea" ? ",codeprotect" : "")."',
242
-		theme_advanced_buttons1_add: 'fontsizeselect',
243
-		theme_advanced_buttons2_add: 'separator,pasteword,pastetext',
244
-		theme_advanced_buttons3_add_before: 'tablecontrols,separator',
245
-		theme_advanced_buttons3_add: 'advhr',
246
-		theme_advanced_toolbar_align: 'center',
247
-		theme_advanced_statusbar_location: 'bottom',
248
-		theme_advanced_path: 'false',
249
-		editor_deselector: 'mceNoEditor',
250
-";
239
+  		theme: 'modern',
240
+		skin: 'lightgray',
241
+		min_height: 200,
242
+		plugins: [
243
+		    'autolink lists link image charmap paste preview hr anchor pagebreak',
244
+		    'searchreplace wordcount visualblocks visualchars code fullscreen',
245
+		    'insertdatetime media nonbreaking save table contextmenu directionality',
246
+		    'emoticons template textcolor colorpicker textpattern imagetools toc textcolor table'
247
+		],
248
+		paste_word_valid_elements: 'b,strong,i,em,h1,h2,u,p,ol,ul,li,a[href],span,color,font-size,font-color,font-family,mark,table,tr,td',
249
+		  		paste_retain_style_properties : 'all',
250
+		paste_strip_class_attributes: 'none',
251
+		toolbar1: 'undo redo | insert styleselect | bold italic underline strikethrough | link image | alignleft aligncenter alignright alignjustify',
252
+		toolbar2: 'preview | bullist numlist | forecolor backcolor emoticons | fontselect |  fontsizeselect wordcount',
253
+		image_advtab: true,
254
+		templates: [
255
+		    { title: 'Test template 1', content: 'Test 1' },
256
+		    { title: 'Test template 2', content: 'Test 2' }
257
+		],
258
+		content_css: [
259
+		    '//fonts.googleapis.com/css?family=Lato:300,300i,400,400i',
260
+		    '//www.tinymce.com/css/codepen.min.css'
261
+		],";
251 262
 		if(USERUID) 
252 263
 			echo "		external_image_list_url : '".STORIESPATH."/".USERUID."/images/imagelist.js',";
253 264
 		echo "
254
-		theme_advanced_resizing: true,".($current == "adminarea" ? "\n\t\tentity_encoding: 'raw'" : "\n\t\tinvalid_elements: 'script,object,applet,iframe'")."
265
+		theme_modern_resizing: true,".($current == "adminarea" ? "\n\t\tentity_encoding: 'raw'" : "\n\t\tinvalid_elements: 'script,object,applet,iframe'")."
255 266
    });
267
+	
256 268
 ";
257 269
 	}
258 270
 	echo "
... ...
@@ -266,6 +278,17 @@ var tinyMCEmode = true;
266 278
 			tinyMCE.execCommand('mceRemoveControl', false, id);
267 279
 	}
268 280
 ";
281
+/*echo "
282
+var tinyMCEmode = true;
283
+	function toogleEditorMode(id) {
284
+		var elm = document.getElementById(id);
285
+
286
+		if (tinyMCE.get(id) == null)
287
+			tinyMCE.execCommand('mceAddControl', false, id);
288
+		else
289
+			tinyMCE.execCommand('mceRemoveControl', false, id);
290
+	}
291
+";*/
269 292
 echo " --></script>";
270 293
 }
271 294
 }
... ...
@@ -325,7 +348,7 @@ document.body.insertAdjacentHTML('beforeEnd', WebBrowser);
325 348
 }
326 349
 else {
327 350
 echo "<style type=\"text/css\">
328
-#columncontainer { margin: 1em auto; width: auto;}
351
+#columncontainer { margin: 1em auto; width: auto; padding: 5%;}
329 352
 #browseblock, #memberblock { width: 100%; padding: 0; margin: 0; float: left; border: 0px solid transparent; }
330 353
 .column { float: left; width: ".($colwidth - 1)."%; }
331 354
 html>body .column { width: $colwidth%; }
... ...
@@ -333,7 +356,7 @@ html>body .column { width: $colwidth%; }
333 356
 #settingsform { margin: 0; padding: 0; border: none; }
334 357
 #settingsform FORM { width: 100%; margin: 0 10%; }
335 358
 #settingsform LABEL { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left; }
336
-#settingsform DIV { margin: 1ex auto; clear: both;}
359
+#settingsform DIV { clear: both;}
337 360
 #settingsform .fieldset SPAN { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left;}
338 361
 #settingsform .fieldset LABEL { float: none; width: auto; display: inline; text-align: left; clear: none; }
339 362
 #settingsform { float: left; margin: 1ex 10%; }
... ...
@@ -397,9 +420,7 @@ a.pophelp:hover span{ /*the span will display just on :hover state*/
397 420
 }
398 421
 
399 422
 </style>
400
-<link rel='stylesheet' type='text/css' href='$skindir/style.css' /> \n
401
-<meta name='viewport' content='width=device-width, initial-scale=1.0' />
402
-";
423
+<link rel=\"stylesheet\" type=\"text/css\" href='$skindir/style.css'>";
403 424
 }
404 425
 echo "</head>";
405 426
 $headerSent = true;
... ...
@@ -410,4 +431,4 @@ if($debug == 1) {
410 431
 	echo "\n<!-- \$_COOKIE \n"; print_r($_COOKIE); echo " -->";
411 432
 	echo "\n<!-- \$_POST \n"; print_r($_POST); echo " -->";
412 433
 }
413
-?>
434
+?>
414 435
\ No newline at end of file