some bug fixes

updated new IDs in files git-svn-id: http://svn.xp-dev.com/svn/Sweil_fs2/src@116 b49b0359-402e-0410-ad19-9fd90e479030
frogsystem · Sep 12, 2008 · 5b80014 · 5b80014
1 parent a792c8f
commit 5b80014
Show file tree

Hide file tree

Showing 77 changed files with 248 additions and 348 deletions.
diff --git a/www/admin/admin_allconfig.php b/www/admin/admin_allconfig.php
@@ -188,7 +188,8 @@
 							ORDER BY `id`
 	", $db );
     while ( $design_arr = mysql_fetch_assoc ( $index ) ) {
-        echo '<option value="'.$design_arr['id'].'" '.getselected ( $design_arr['id'], $_POST['design'] ).'>'.$design_arr['name'];
+		settype ( $design_arr['id'], "integer" );
+		echo '<option value="'.$design_arr['id'].'" '.getselected ( $design_arr['id'], $_POST['design'] ).'>'.killhtml($design_arr['name']);
         if ( $design_arr['id'] == $_POST['design'] ) {
             echo ' ('.$admin_phrases[common][active].')';
         }
@@ -235,7 +236,7 @@
 										</tr>
 										<tr valign="bottom">
  											<td class="config">
-												<input class="pointer" type="radio" name="home" value="1" '.getchecked ( "1", $_POST['home'] ).'>
+												<input class="pointer" type="radio" name="home" value="1" '.getchecked ( 1, $_POST['home'] ).'>
 											</td>
 											<td class="config">
 												?go = <input class="text" size="20" name="home_text" maxlength="100" value="'.$_POST['home_text'].'">

diff --git a/www/admin/admin_allemail.php b/www/admin/admin_allemail.php
@@ -58,9 +58,8 @@
 
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="emailtemplate" name="go">
+                        <input type="hidden" name="go" value="gen_emails">
                         <input type="hidden" name="sended" value="1">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
                         <table class="configtable" cellpadding="4" cellspacing="0">
                             <tr><td class="line" colspan="2">'.$admin_phrases[general][email_info].'</td></tr>
                             <tr>

diff --git a/www/admin/admin_allphpinfo.php b/www/admin/admin_allphpinfo.php
@@ -1,11 +1,14 @@
 <?php
-if (isset($_GET[info]))
-{
-    phpinfo();
+if ( isset ( $_GET['info'] ) ) {
+	// Start Session
+	session_start();
+	if ( $_SESSION['gen_phpinfo'] == 1 ) {
+	    phpinfo();
+	}
+
 }
-else
-{
-    echo'
+elseif ( $_SESSION['gen_phpinfo'] == 1 ) {
+    echo '
                         <table class="configtable" cellpadding="4" cellspacing="0">
                             <tr><td class="line" colspan="4">'.$admin_phrases[general][phpinfo_title].'</td></tr>
                             <tr>
@@ -75,6 +78,6 @@
                                 </td>
                             </tr>
                         </table>
-    ';
+	';
 }
 ?>
diff --git a/www/admin/admin_articles_add.php b/www/admin/admin_articles_add.php
@@ -135,7 +135,6 @@
 					<form action="" method="post">
 						<input type="hidden" name="go" value="articles_add">
                         <input type="hidden" name="sended" value="1">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
                         <table class="configtable" cellpadding="4" cellspacing="0">
 							<tr><td class="line" colspan="2">'.$admin_phrases[articles][articles_info_title].'</td></tr>
                             <tr>

diff --git a/www/admin/admin_articles_cat.php b/www/admin/admin_articles_cat.php
@@ -320,7 +320,6 @@
 						<input type="hidden" name="cat_action" value="'.$_POST['cat_action'].'">
 						<input type="hidden" name="cat_id" value="'.$cat_arr['cat_id'].'">
 						<input type="hidden" name="go" value="articles_cat">
-						<input type="hidden" name="PHPSESSID" value="'.session_id().'">
 						<table class="configtable" cellpadding="4" cellspacing="0">
 							<tr><td class="line" colspan="2">'.$admin_phrases[articles][delete_cat_title].'</td></tr>
 							<tr>

diff --git a/www/admin/admin_articles_edit.php b/www/admin/admin_articles_edit.php
@@ -47,12 +47,14 @@ function default_display_filter ( $FORM )
     									$index = mysql_query ( "SELECT * FROM ".$global_config_arr['pref']."articles_cat", $db );
     									while ( $cat_arr = mysql_fetch_assoc ( $index ) )
     									{
+											settype ( $cat_arr['cat_id'], "integer" );
 											echo '<option value="'.$cat_arr['cat_id'].'" '.getselected( $cat_arr['cat_id'], $FORM['cat_id'] ).'>'.$cat_arr['cat_name'].'</option>';
     									}
 	echo'
                                     </select>
-									'.$admin_phrases[articles][edit_filter_sort].'
+									<br><br>'.$admin_phrases[articles][edit_filter_sort].'
                                     <select name="order">
+                                        <option value="article_id" '.getselected ( "article_id", $FORM['order'] ).'>Artikel-ID</option>
                                         <option value="article_date" '.getselected ( "article_date", $FORM['order'] ).'>'.$admin_phrases[articles][edit_filter_date].'</option>
                                         <option value="article_title" '.getselected ( "article_title", $FORM['order'] ).'>'.$admin_phrases[articles][edit_filter_arttitle].'</option>
                                         <option value="article_url" '.getselected ( "article_url", $FORM['order'] ).'>'.$admin_phrases[articles][edit_filter_url].'</option>
@@ -89,7 +91,7 @@ function default_get_pagenav_data ()
 	unset ( $where_clause );
     if ( $_REQUEST['cat_id'] != 0 )
 	{
-        $where_clause = "WHERE cat_id = '".$_REQUEST['cat_id']."'";
+        $where_clause = "WHERE article_cat_id = '".$_REQUEST['cat_id']."'";
     }
 
 	// Create Pagenavigation
@@ -162,7 +164,7 @@ function default_get_entry_data ( $articles_arr )
 
 	// Get other Data
 	if ( $articles_arr['article_date'] != 0 ) {
-        $articles_arr['article_date_formated'] = "".$admin_phrases[common][on]." <b>" . date ( $admin_phrases[common][date_format] , $articles_arr['article_date'] ) . "</b>,";
+        $articles_arr['article_date_formated'] = "".$admin_phrases[common][on_date]." <b>" . date ( $admin_phrases[common][date_format] , $articles_arr['article_date'] ) . "</b>,";
 	} else {
 	    $articles_arr['article_date_formated'] = "";
 	}
@@ -256,15 +258,15 @@ function default_display_all_entries ( $pagenav_arr )
 	unset ( $where_clause );
     if ( $_REQUEST['cat_id'] != 0 )
 	{
-        $where_clause = "WHERE cat_id = '".$_REQUEST['cat_id']."'";
+        $where_clause = "WHERE article_cat_id = '".$_REQUEST['cat_id']."'";
     }
 
 	// Load News From DB
 	$index = mysql_query ( "
 							SELECT *
 							FROM ".$global_config_arr['pref']."articles
 							".$where_clause."
-							ORDER BY ".$_REQUEST['order'].", article_title ".$_REQUEST['sort']."
+							ORDER BY ".$_REQUEST['order']." ".$_REQUEST['sort'].", article_title ASC
 							LIMIT ".$pagenav_arr['cur_start'].", ".$pagenav_arr['entries_per_page']."
 	", $db);
 

diff --git a/www/admin/admin_cimg.php b/www/admin/admin_cimg.php
@@ -66,8 +66,7 @@
 
 echo'
                     <form action="" enctype="multipart/form-data" method="post">
-                        <input type="hidden" value="cimgadd" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="cimg_add" name="go">
                         <input type="hidden" name="sended" value="">
                         <table border="0" cellpadding="4" cellspacing="0" width="600">
                             <tr>

diff --git a/www/admin/admin_cimgdel.php b/www/admin/admin_cimgdel.php
@@ -4,11 +4,11 @@ function cimgdel (file)
       {
         var Check = confirm("Soll das Bild wirklich gelöscht werden?");
         if (Check == true)
-          location.href = "?mid='.$_GET[mid].'&go=cimgdel&unlink=" + file + "'.$session_url.'";
+          location.href = "?go=cimg_admin&unlink=" + file + "'.$session_url.'";
       }
       </script>';
 
-if (isset($_GET['unlink']))
+if (isset($_GET['unlink']) && $_SESSION['cimg_admin'] == 1 )
 {
   unlink("../images/content/".$_GET['unlink']);
   systext("Das Bild \"".$_GET['unlink']."\" wurde gelöscht!");

diff --git a/www/admin/admin_dladd.php b/www/admin/admin_dladd.php
@@ -83,10 +83,9 @@
 
     echo'
                     <form id="form" action="" enctype="multipart/form-data" method="post">
-                        <input type="hidden" value="dladd" name="go">
+                        <input type="hidden" value="dl_add" name="go">
                         <input id="send" type="hidden" value="0" name="dladd">
                         <input type="hidden" value="'.$_POST[options].'" name="options">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
                         <input type="hidden" value="'.$_SESSION[user_id].'" name="userid">
                         <table border="0" cellpadding="4" cellspacing="0" width="600">
                             <tr>

diff --git a/www/admin/admin_dlcat.php b/www/admin/admin_dlcat.php
@@ -41,8 +41,7 @@
     $cat_arr = mysql_fetch_assoc($index);
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="dlcat" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="dl_cat" name="go">
                         <input type="hidden" value="'.$cat_arr[cat_id].'" name="catid">
                         <table border="0" cellpadding="4" cellspacing="0" width="600">
                             <tr>
@@ -101,8 +100,7 @@
 {
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="dlcat" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="dl_cat" name="go">
                         <table border="0" cellpadding="2" cellspacing="0" width="600">
                             <tr>
                                 <td class="config" width="40%">

diff --git a/www/admin/admin_dlconfig.php b/www/admin/admin_dlconfig.php
@@ -33,8 +33,7 @@
     $config_arr = mysql_fetch_assoc($index);
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="dlconfig" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="dl_config" name="go">
                         <table border="0" cellpadding="4" cellspacing="0" width="600">
                             <tr>
                                 <td class="config" valign="top" width="70%">

diff --git a/www/admin/admin_dledit.php b/www/admin/admin_dledit.php
@@ -182,11 +182,10 @@
 
     echo'
                     <form id="form" action="" enctype="multipart/form-data" method="post">
-                        <input type="hidden" value="dledit" name="go">
+                        <input type="hidden" name="go" value="dl_edit">
                         <input id="send" type="hidden" value="0" name="dledit">
                         <input type="hidden" value="'.$_POST[dlid].'" name="tempid">
                         <input type="hidden" value="'.$_POST[options].'" name="options">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
                         <input type="hidden" value="'.$_POST[dlid].'" name="editdlid">
                         <table border="0" cellpadding="4" cellspacing="0" width="600">
                             <tr>
@@ -355,7 +354,7 @@
 {
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="dledit" name="go">
+                        <input type="hidden" value="dl_edit" name="go">
                         <input type="hidden" value="'.session_id().'" name="PHPSESSID">
                         <table border="0" cellpadding="2" cellspacing="0" width="600">
                             <tr>
@@ -385,8 +384,7 @@
 
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="dledit" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="dl_edit" name="go">
                         <table border="0" cellpadding="2" cellspacing="0" width="600">
                             <tr>
                                 <td class="config" width="40%">

diff --git a/www/admin/admin_dlnewcat.php b/www/admin/admin_dlnewcat.php
@@ -33,8 +33,7 @@
 {
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="dlnewcat" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="dl_newcat" name="go">
                         <table border="0" cellpadding="4" cellspacing="0" width="600">
                             <tr>
                                 <td class="config" valign="top">

diff --git a/www/admin/admin_editor_config.php b/www/admin/admin_editor_config.php
@@ -125,9 +125,8 @@
 
     echo'
                     <form action="" method="post">
-                        <input type="hidden" value="editorconfig" name="go">
+                        <input type="hidden" value="editor_config" name="go">
                         <input type="hidden" name="sended" value="1">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
                         <table class="configtable" cellpadding="4" cellspacing="0">
                             <tr><td class="line" colspan="2">'.$admin_phrases[editor][view_settings_title].'</td></tr>
                             <tr>

diff --git a/www/admin/admin_editor_design.php b/www/admin/admin_editor_design.php
@@ -27,7 +27,11 @@
 #### / explanation of editor creation ####
 ##########################################
 
-    $TEMPLATE_GO = "editordesign";
+	if ( $go == "tpl_editor" ) {
+        $TEMPLATE_GO = "tpl_editor";
+	} else {
+		$TEMPLATE_GO = "editor_design";
+	}
     unset($tmp);
 
     $tmp[name] = "editor_button";
@@ -84,13 +88,5 @@
 //// Intialise Editor ////
 //////////////////////////
 
-if (templatepage_postcheck($TEMPLATE_EDIT))
-{
-    templatepage_save($TEMPLATE_EDIT);
-    systext("Template wurde aktualisiert");
-}
-else
-{
-    echo create_templatepage ($TEMPLATE_EDIT, $TEMPLATE_GO);
-}
+echo templatepage_init ($TEMPLATE_EDIT, $TEMPLATE_GO);
 ?>
diff --git a/www/admin/admin_editor_fscode.php b/www/admin/admin_editor_fscode.php
@@ -27,7 +27,11 @@
 #### / explanation of editor creation ####
 ##########################################
 
-    $TEMPLATE_GO = "editorfscode";
+	if ( $go == "tpl_fscodes" ) {
+        $TEMPLATE_GO = "tpl_fscodes";
+	} else {
+		$TEMPLATE_GO = "editor_fscodes";
+	}
     unset($tmp);
 
     $tmp[name] = "quote_tag";
@@ -69,13 +73,5 @@
 //// Intialise Editor ////
 //////////////////////////
 
-if (templatepage_postcheck($TEMPLATE_EDIT))
-{
-    templatepage_save($TEMPLATE_EDIT);
-    systext("Template wurde aktualisiert");
-}
-else
-{
-    echo create_templatepage ($TEMPLATE_EDIT, $TEMPLATE_GO);
-}
+echo templatepage_init ($TEMPLATE_EDIT, $TEMPLATE_GO);
 ?>
diff --git a/www/admin/admin_editor_smilies.php b/www/admin/admin_editor_smilies.php
@@ -85,8 +85,7 @@
   $index = mysql_query("SELECT * FROM ".$global_config_arr[pref]."smilies ORDER BY `order` ASC", $db);
 
   echo'<form action="" method="post" enctype="multipart/form-data">
-         <input type="hidden" value="editorsmilies" name="go">
-         <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+         <input type="hidden" value="editor_smilies" name="go">
          <table class="configtable" cellpadding="4" cellspacing="0">
            <tr><td class="line" colspan="3">'.$admin_phrases[editor][smilie_add_title].'</td></tr>
            <tr>
@@ -144,8 +143,7 @@
                     </table>
                     
                     <form action="" method="post">
-                        <input type="hidden" value="editorsmilies" name="go">
-                        <input type="hidden" value="'.session_id().'" name="PHPSESSID">
+                        <input type="hidden" value="editor_smilies" name="go">
                         <table class="configtable" cellpadding="2" cellspacing="0">
                            <tr>
                                 <td width="175"></td>

diff --git a/www/admin/admin_findpicture.php b/www/admin/admin_findpicture.php
@@ -1,7 +1,24 @@
 <?php
-include("../login.inc.php");
-include("../includes/functions.php");
-include("../includes/adminfunctions.php");
+///////////////////////////////////
+//// PATH_SEPARATOR definieren ////
+///////////////////////////////////
+if ( ! defined( "PATH_SEPARATOR" ) ) {
+  if ( strpos( $_ENV[ "OS" ], "Win" ) !== false )
+    define( "PATH_SEPARATOR", ";" );
+  else define( "PATH_SEPARATOR", ":" );
+}
+
+// Start Session
+session_start();
+
+// script path-length
+$delete_last = strlen ( "/admin/admin_findpicture.php" ) * -1;
+// Set Include Path
+set_include_path ( substr ( __FILE__, 0, $delete_last ) );
+
+require("login.inc.php");
+require("includes/functions.php");
+require("includes/adminfunctions.php");
 
 echo'
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

diff --git a/www/admin/admin_finduser.php b/www/admin/admin_finduser.php
@@ -1,8 +1,25 @@
 <?php
-include("../login.inc.php");
-include("../includes/functions.php");
-include("../includes/adminfunctions.php");
-include("../phrases/admin_phrases_".$global_config_arr['language'].".php");
+///////////////////////////////////
+//// PATH_SEPARATOR definieren ////
+///////////////////////////////////
+if ( ! defined( "PATH_SEPARATOR" ) ) {
+  if ( strpos( $_ENV[ "OS" ], "Win" ) !== false )
+    define( "PATH_SEPARATOR", ";" );
+  else define( "PATH_SEPARATOR", ":" );
+}
+
+// Start Session
+session_start();
+
+// script path-length
+$delete_last = strlen ( "/admin/admin_finduser.php" ) * -1;
+// Set Include Path
+set_include_path ( substr ( __FILE__, 0, $delete_last ) );
+
+require("login.inc.php");
+require("includes/functions.php");
+require("includes/adminfunctions.php");
+require("phrases/admin_phrases_".$global_config_arr['language'].".php");
 
 echo'
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">