diff --git a/www/admin/admin.css b/www/admin/admin.css
index df09b0b..0fff5d5 100644
--- a/www/admin/admin.css
+++ b/www/admin/admin.css
@@ -21,14 +21,34 @@ body
/**************************************************/
/* formular styles */
/**************************************************/
+.input_width
+{
+ width:275px;
+}
+.input_highlight:focus, input_highlight:active
+{
+ background-color:#64DC6A;
+}
+
textarea
{
color:#000000;
- font-size:8pt;
- font-family:Verdana;
+ font-size:9pt;
+ font-family: "Courier New", Courier, monospace;
border:1px solid #000000;
background-color:#B7B7B7;
}
+.nomonospace
+{
+ font-family: Verdana, sans-serif;
+ font-size:8pt;
+
+}
+.monospace
+{
+ font-family: "Courier New", Courier, monospace;
+ font-size:9pt;
+}
select
{
color:#000000;
@@ -38,7 +58,7 @@ select
background-color:#B7B7B7;
cursor:pointer;
}
-.text, .courier
+.text
{
color:#000000;
font-size:8pt;
@@ -47,11 +67,6 @@ select
background-color:#B7B7B7;
font-weight:normal;
}
-.courier
-{
- font-size:8pt;
- font-family: "Courier New", Courier , serif;
-}
.button
{
color:#000000;
@@ -70,9 +85,10 @@ select
.button_new
{
display:block;
- padding:4px;
+ padding:3px;
padding-right:9px;
width:100%;
+ height: 27px;
background-image:url('img/button.jpg');
background-repeat:repeat;
font-weight:bold;
@@ -396,13 +412,13 @@ a.menu_link_right:hover, a.menu_link_right:focus
#menu_top_table
{
- width: 100%;
- padding-top: 4px;
+ width: 100%;
+ padding-top: 4px;
}
#menu_top_tr
{
- height: 38px;
- vertical-align: top;
+ height: 38px;
+ vertical-align: top;
}
#menu_top_log
@@ -415,15 +431,15 @@ a.menu_link_right:hover, a.menu_link_right:focus
top: 98px;
left: 50%;
margin-left: 393px;
- padding-left: 12px;
- padding-top: 3px;
- text-align: left;
+ padding-left: 12px;
+ padding-top: 3px;
+ text-align: left;
z-index:5;
}
#menu_top_log_image_td
{
padding-right: 5px;
- padding-top: 2px;
+ padding-top: 2px;
}
@@ -560,7 +576,7 @@ a.tooltip {
font-weight: normal;
border: none;
}
-a.tooltip:hover {
+a.tooltip:hover, a.tooltip:focus {
z-index: 1000;
background: transparent;
cursor:help;
@@ -578,7 +594,7 @@ a.tooltip span {
border: none;
font-size:7pt;
}
-a.tooltip:hover span {
+a.tooltip:hover span, a.tooltip:focus span {
display: block;
position: absolute;
top: 25px;
diff --git a/www/admin/admin_allconfig.php b/www/admin/admin_allconfig.php
index 6d417d3..8073f04 100644
--- a/www/admin/admin_allconfig.php
+++ b/www/admin/admin_allconfig.php
@@ -15,60 +15,64 @@
&& ( $_POST['home'] == 0 || ( $_POST['home'] == 1 && $_POST['home_text'] != "" ) )
)
{
- // security functions
- if ( substr ( $_POST['virtualhost'], -1 ) != "/" ) {
- $_POST['virtualhost'] = $_POST['virtualhost']."/";
- }
+ // security functions
+ if ( substr ( $_POST['virtualhost'], -1 ) != "/" ) {
+ $_POST['virtualhost'] = $_POST['virtualhost']."/";
+ }
- $_POST['virtualhost'] = savesql ( $_POST['virtualhost'] );
- $_POST['admin_mail'] = savesql ( $_POST['admin_mail'] );
- $_POST['title'] = savesql ( $_POST['title'] );
- $_POST['description'] = savesql ( $_POST['description'] );
- $_POST['keywords'] = savesql ( $_POST['keywords'] );
- $_POST['author'] = savesql ( $_POST['author'] );
- $_POST['date'] = savesql ( $_POST['date'] );
- $_POST['page'] = savesql ( $_POST['page'] );
- $_POST['page_next'] = savesql ( $_POST['page_next'] );
- $_POST['page_prev'] = savesql ( $_POST['page_prev'] );
- $_POST['feed'] = savesql ( $_POST['feed'] );
- $_POST['language'] = savesql ( $_POST['language'] );
- $_POST['home_text'] = savesql ( $_POST['home_text'] );
- $_POST['dyn_title_ext'] = savesql ( $_POST['dyn_title_ext'] );
+ $_POST['virtualhost'] = savesql ( $_POST['virtualhost'] );
+ $_POST['admin_mail'] = savesql ( $_POST['admin_mail'] );
+ $_POST['title'] = savesql ( $_POST['title'] );
+ $_POST['description'] = savesql ( $_POST['description'] );
+ $_POST['keywords'] = savesql ( $_POST['keywords'] );
+ $_POST['author'] = savesql ( $_POST['author'] );
+ $_POST['date'] = savesql ( $_POST['date'] );
+ $_POST['time'] = savesql ( $_POST['time'] );
+ $_POST['datetime'] = savesql ( $_POST['datetime'] );
+ $_POST['page'] = savesql ( $_POST['page'] );
+ $_POST['page_next'] = savesql ( $_POST['page_next'] );
+ $_POST['page_prev'] = savesql ( $_POST['page_prev'] );
+ $_POST['feed'] = savesql ( $_POST['feed'] );
+ $_POST['language'] = savesql ( $_POST['language'] );
+ $_POST['home_text'] = savesql ( $_POST['home_text'] );
+ $_POST['dyn_title_ext'] = savesql ( $_POST['dyn_title_ext'] );
- settype ( $_POST['show_favicon'], "integer" );
- settype ( $_POST['design'], "integer" );
- settype ( $_POST['allow_other_designs'], "integer" );
- settype ( $_POST['home'], "integer" );
- settype ( $_POST['dyn_title'], "integer" );
+ settype ( $_POST['show_favicon'], "integer" );
+ settype ( $_POST['design'], "integer" );
+ settype ( $_POST['allow_other_designs'], "integer" );
+ settype ( $_POST['home'], "integer" );
+ settype ( $_POST['dyn_title'], "integer" );
- // MySQL-Queries
+ // MySQL-Queries
mysql_query ( "
- UPDATE `".$global_config_arr['pref']."global_config`
- SET
- `virtualhost` = '".$_POST['virtualhost']."',
- `admin_mail` = '".$_POST['admin_mail']."',
- `title` = '".$_POST['title']."',
- `dyn_title` = '".$_POST['dyn_title']."',
- `dyn_title_ext` = '".$_POST['dyn_title_ext']."',
- `description` = '".$_POST['description']."',
- `keywords` = '".$_POST['keywords']."',
- `author` = '".$_POST['author']."',
- `show_favicon` = '".$_POST['show_favicon']."',
- `design` = '".$_POST['design']."',
- `allow_other_designs` = '".$_POST['allow_other_designs']."',
- `date` = '".$_POST['date']."',
- `page` = '".$_POST['page']."',
- `page_next` = '".$_POST['page_next']."',
- `page_prev` = '".$_POST['page_prev']."',
- `feed` = '".$_POST['feed']."',
- `language` = '".$_POST['language']."',
- `home` = '".$_POST['home']."',
- `home_text` = '".$_POST['home_text']."'
- WHERE `id` = '1'
- ", $db );
-
- // system messages
- systext($admin_phrases[common][changes_saved], $admin_phrases[common][info]);
+ UPDATE `".$global_config_arr['pref']."global_config`
+ SET
+ `virtualhost` = '".$_POST['virtualhost']."',
+ `admin_mail` = '".$_POST['admin_mail']."',
+ `title` = '".$_POST['title']."',
+ `dyn_title` = '".$_POST['dyn_title']."',
+ `dyn_title_ext` = '".$_POST['dyn_title_ext']."',
+ `description` = '".$_POST['description']."',
+ `keywords` = '".$_POST['keywords']."',
+ `author` = '".$_POST['author']."',
+ `show_favicon` = '".$_POST['show_favicon']."',
+ `design` = '".$_POST['design']."',
+ `allow_other_designs` = '".$_POST['allow_other_designs']."',
+ `date` = '".$_POST['date']."',
+ `time` = '".$_POST['time']."',
+ `datetime` = '".$_POST['datetime']."',
+ `page` = '".$_POST['page']."',
+ `page_next` = '".$_POST['page_next']."',
+ `page_prev` = '".$_POST['page_prev']."',
+ `feed` = '".$_POST['feed']."',
+ `language` = '".$_POST['language']."',
+ `home` = '".$_POST['home']."',
+ `home_text` = '".$_POST['home_text']."'
+ WHERE `id` = '1'
+ ", $db );
+
+ // system messages
+ systext( $admin_phrases[common][changes_saved], $admin_phrases[common][info], FALSE, $admin_phrases[icons][save_ok] );
// Unset Vars
unset ( $_POST );
@@ -82,7 +86,7 @@
{
// Display Error Messages
if ( isset ( $_POST['sended'] ) ) {
- systext ( $admin_phrases[common][note_notfilled], $admin_phrases[common][error], TRUE );
+ systext ( $admin_phrases[common][changes_not_saved].'
'.$admin_phrases[common][note_notfilled], $admin_phrases[common][error], TRUE, $admin_phrases[icons][save_error] );
// Load Data from DB into Post
} else {
@@ -103,6 +107,8 @@
$_POST['admin_mail'] = killhtml ( $_POST['admin_mail'] );
$_POST['keywords'] = killhtml ( $_POST['keywords'] );
$_POST['date'] = killhtml ( $_POST['date'] );
+ $_POST['time'] = killhtml ( $_POST['time'] );
+ $_POST['datetime'] = killhtml ( $_POST['datetime'] );
$_POST['page'] = killhtml ( $_POST['page'] );
$_POST['page_next'] = killhtml ( $_POST['page_next'] );
$_POST['page_prev'] = killhtml ( $_POST['page_prev'] );
@@ -127,18 +133,18 @@
// Display Form
echo '
-
';
diff --git a/www/admin/admin_logout.php b/www/admin/admin_logout.php
index ba85954..2316a13 100644
--- a/www/admin/admin_logout.php
+++ b/www/admin/admin_logout.php
@@ -1,4 +1,4 @@
\ No newline at end of file
diff --git a/www/admin/admin_news_add.php b/www/admin/admin_news_add.php
index 8ebef45..496ccd4 100644
--- a/www/admin/admin_news_add.php
+++ b/www/admin/admin_news_add.php
@@ -69,7 +69,7 @@
}
mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET news = news + 1", $db );
- systext( $admin_phrases[news][news_added], $admin_phrases[common][info]);
+ systext( $admin_phrases[news][news_added], $admin_phrases[common][info], FALSE, $admin_phrases[icons][save_add] );
// Unset Vars
unset ( $_POST );
@@ -82,7 +82,7 @@
if ( TRUE )
{
if ( isset ( $_POST['sended'] ) && isset ( $_POST['addnews'] ) ) {
- systext($admin_phrases[common][note_notfilled], $admin_phrases[common][error], TRUE);
+ systext ( $admin_phrases[news][news_not_added].'
'.$admin_phrases[common][note_notfilled], $admin_phrases[common][error], TRUE, $admin_phrases[icons][save_error] );
} else {
$_POST['news_active'] = 1;
$_POST['news_comments_allowed'] = 1;
diff --git a/www/admin/admin_news_edit.php b/www/admin/admin_news_edit.php
index 0f94a58..37f0c57 100644
--- a/www/admin/admin_news_edit.php
+++ b/www/admin/admin_news_edit.php
@@ -1,4 +1,9 @@
" . date ( $admin_phrases[common][date_format] , $news_arr['news_date'] ) . " ".$admin_phrases[common][at]." " . date ( $admin_phrases[common][time_format] , $news_arr['news_date'] ) . "";
-
- $news_arr['news_text_short'] = killfs ( truncate_string ( $news_arr['news_text'], 250, "..." ) );
- $index2 = mysql_query("SELECT COUNT(comment_id) AS 'number' FROM ".$global_config_arr['pref']."news_comments WHERE news_id = ".$news_arr['news_id']."", $db );
- $news_arr['num_comments'] = mysql_result ( $index2, 0, "number" );
+ $index2 = mysql_query("SELECT COUNT(comment_id) AS 'number' FROM ".$global_config_arr['pref']."news_comments WHERE news_id = ".$news_arr['news_id']."", $db );
+ $news_arr['num_comments'] = mysql_result ( $index2, 0, "number" );
- $index2 = mysql_query("SELECT user_name FROM ".$global_config_arr['pref']."user WHERE user_id = ".$news_arr['user_id']."", $db );
- $news_arr['user_name'] = mysql_result ( $index2, 0, "user_name" );
+ $index2 = mysql_query("SELECT user_name FROM ".$global_config_arr['pref']."user WHERE user_id = ".$news_arr['user_id']."", $db );
+ $news_arr['user_name'] = mysql_result ( $index2, 0, "user_name" );
$index2 = mysql_query("SELECT cat_name FROM ".$global_config_arr['pref']."news_cat WHERE cat_id = ".$news_arr['cat_id']."", $db );
- $news_arr['cat_name'] = mysql_result ( $index2, 0, "cat_name" );
+ $news_arr['cat_name'] = mysql_result ( $index2, 0, "cat_name" );
+
+ $return_arr[] = $news_arr;
+ }
- return $news_arr;
+ return $return_arr;
}
-function action_delete_display_page ( $news_arr )
+function action_delete_display_page ( $return_arr )
{
global $db;
global $global_config_arr;
global $admin_phrases;
+
+
echo '
-
+
';
}
@@ -1088,168 +1117,165 @@ function action_comments_delete ( $DATA )
function db_edit_news ( $DATA )
{
- global $db;
- global $global_config_arr;
- global $admin_phrases;
-
- $DATA['news_text'] = savesql ( $DATA['news_text'] );
+ global $db;
+ global $global_config_arr;
+ global $admin_phrases;
+
+ $DATA['news_text'] = savesql ( $DATA['news_text'] );
$DATA['news_title'] = savesql ( $DATA['news_title'] );
settype ( $DATA['news_id'], "integer" );
- settype ( $DATA['cat_id'], "integer" );
+ settype ( $DATA['cat_id'], "integer" );
settype ( $DATA['user_id'], "integer" );
settype ( $DATA['news_active'], "integer" );
settype ( $DATA['news_comments_allowed'], "integer" );
$date_arr = getsavedate ( $DATA['d'], $DATA['m'], $DATA['y'], $DATA['h'], $DATA['i'] );
- $newsdate = mktime ( $date_arr['h'], $date_arr['i'], 0, $date_arr['m'], $date_arr['d'], $date_arr['y'] );
+ $newsdate = mktime ( $date_arr['h'], $date_arr['i'], 0, $date_arr['m'], $date_arr['d'], $date_arr['y'] );
- // MySQL-Update-Query
+ // MySQL-Update-Query
mysql_query ( "
- UPDATE
- ".$global_config_arr['pref']."news
- SET
- cat_id = '".$DATA['cat_id']."',
- user_id = '".$DATA['user_id']."',
- news_date = '".$newsdate."',
- news_title = '".$DATA['news_title']."',
- news_text = '".$DATA['news_text']."',
- news_active = '".$DATA['news_active']."',
- news_comments_allowed = '".$DATA['news_comments_allowed']."'
- WHERE
- news_id = '".$DATA['news_id']."'
+ UPDATE
+ ".$global_config_arr['pref']."news
+ SET
+ cat_id = '".$DATA['cat_id']."',
+ user_id = '".$DATA['user_id']."',
+ news_date = '".$newsdate."',
+ news_title = '".$DATA['news_title']."',
+ news_text = '".$DATA['news_text']."',
+ news_active = '".$DATA['news_active']."',
+ news_comments_allowed = '".$DATA['news_comments_allowed']."'
+ WHERE
+ news_id = '".$DATA['news_id']."'
", $db );
// Delete all Links
mysql_query ( "
- DELETE FROM
- ".$global_config_arr['pref']."news_links
- WHERE
- news_id = '".$DATA['news_id']."'
- ", $db );
+ DELETE FROM
+ ".$global_config_arr['pref']."news_links
+ WHERE
+ news_id = '".$DATA['news_id']."'
+ ", $db );
- // Write Links into DB
- foreach ( $DATA['linkname'] as $key => $value )
- {
- if ( $DATA['linkname'][$key] != "" && $DATA['linkurl'][$key] != "" )
- {
+ // Write Links into DB
+ foreach ( $DATA['linkname'] as $key => $value ) {
+ if ( $DATA['linkname'][$key] != "" && $DATA['linkurl'][$key] != "" ) {
$DATA['linkname'][$key] = savesql ( $DATA['linkname'][$key] );
$DATA['linkurl'][$key] = savesql ( $DATA['linkurl'][$key] );
- switch ( $DATA['linktarget'][$key] )
- {
- case 1: settype ( $$DATA['linktarget'][$key], "integer" ); break;
- default: $DATA['linktarget'][$key] = 0; break;
- }
+ switch ( $DATA['linktarget'][$key] ) {
+ case 1: settype ( $$DATA['linktarget'][$key], "integer" ); break;
+ default: $DATA['linktarget'][$key] = 0; break;
+ }
mysql_query ( "
- INSERT INTO
- ".$global_config_arr['pref']."news_links
- (news_id, link_name, link_url, link_target)
- VALUES (
- '".$DATA['news_id']."',
- '".$DATA['linkname'][$key]."',
- '".$DATA['linkurl'][$key]."',
- '".$DATA['linktarget'][$key]."'
- )
- ", $db );
- }
+ INSERT INTO
+ ".$global_config_arr['pref']."news_links
+ (news_id, link_name, link_url, link_target)
+ VALUES (
+ '".$DATA['news_id']."',
+ '".$DATA['linkname'][$key]."',
+ '".$DATA['linkurl'][$key]."',
+ '".$DATA['linktarget'][$key]."'
+ )
+ ", $db );
+ }
}
- systext( $admin_phrases[common][changes_saved], $admin_phrases[common][info]);
+ systext( $admin_phrases[common][changes_saved], $admin_phrases[common][info], FALSE, $admin_phrases[icons][save_ok] );
}
function db_delete_news ( $DATA )
{
- global $db;
- global $global_config_arr;
- global $admin_phrases;
+ global $db;
+ global $global_config_arr;
+ global $admin_phrases;
- if ( $DATA['news_delete'] == 1 ) {
- settype ( $DATA['news_id'], "integer" );
+ if ( $DATA['news_delete'] == 1 ) {
+ foreach ( $DATA['news_id'] as $news_id ) {
+ settype ( $news_id, "integer" );
- // MySQL-Delete-Query: News
+ // MySQL-Delete-Query: News
mysql_query ( "
- DELETE FROM
- ".$global_config_arr['pref']."news
- WHERE
- news_id = '".$DATA['news_id']."'
- LIMIT
- 1
- ", $db );
-
- // MySQL-Delete-Query: Links
+ DELETE FROM
+ ".$global_config_arr['pref']."news
+ WHERE
+ news_id = '".$news_id."'
+ LIMIT
+ 1
+ ", $db );
+
+ // MySQL-Delete-Query: Links
mysql_query ( "
- DELETE FROM
- ".$global_config_arr['pref']."news_links
- WHERE
- news_id = '".$DATA['news_id']."'
- ", $db );
-
- // MySQL-Delete-Query: Comments
- mysql_query ( "
- DELETE FROM
- ".$global_config_arr['pref']."news_comments
- WHERE
- news_id = '".$DATA['news_id']."'
- ", $db );
- $affacted_rows = mysql_affected_rows ( $db );
-
- // Update Counter
- mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET news = news - 1", $db );
- mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET comments = comments - ".$affacted_rows."", $db );
-
- systext( $admin_phrases[news][news_deleted], $admin_phrases[common][info]);
- } else {
- systext( $admin_phrases[news][news_not_deleted], $admin_phrases[common][info]);
+ DELETE FROM
+ ".$global_config_arr['pref']."news_links
+ WHERE
+ news_id = '".$news_id."'
+ ", $db );
+
+ // MySQL-Delete-Query: Comments
+ mysql_query ( "
+ DELETE FROM
+ ".$global_config_arr['pref']."news_comments
+ WHERE
+ news_id = '".$news_id."'
+ ", $db );
+ $affacted_rows = mysql_affected_rows ( $db );
+
+ // Update Counter
+ mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET news = news - 1", $db );
+ mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET comments = comments - ".$affacted_rows."", $db );
}
+ systext( $admin_phrases[news][news_deleted], $admin_phrases[common][info], FALSE, $admin_phrases[icons][trash_ok] );
+ } else {
+ systext( $admin_phrases[news][news_not_deleted], $admin_phrases[common][info], FALSE, $admin_phrases[icons][trash_error] );
+ }
}
function db_edit_comment ( $DATA )
{
- global $db;
- global $global_config_arr;
- global $admin_phrases;
+ global $db;
+ global $global_config_arr;
+ global $admin_phrases;
- $DATA['title'] = savesql ( $DATA['title'] );
+ $DATA['title'] = savesql ( $DATA['title'] );
$DATA['text'] = savesql ( $DATA['text'] );
settype ( $DATA['comment_id'], "integer" );
-
- // MySQL-Update-Query: Comment
+ // MySQL-Update-Query: Comment
mysql_query ( "
- UPDATE
- ".$global_config_arr['pref']."news_comments
- SET
- comment_title = '".$DATA['title']."',
- comment_text = '".$DATA['text']."'
- WHERE
- comment_id = '".$DATA['comment_id']."'
- ", $db );
-
- systext( $admin_phrases[common][changes_saved], $admin_phrases[common][info]);
+ UPDATE
+ ".$global_config_arr['pref']."news_comments
+ SET
+ comment_title = '".$DATA['title']."',
+ comment_text = '".$DATA['text']."'
+ WHERE
+ comment_id = '".$DATA['comment_id']."'
+ ", $db );
+
+ systext( $admin_phrases[common][changes_saved], $admin_phrases[common][info], FALSE, $admin_phrases[icons][save_ok] );
}
function db_delete_comment ( $DATA )
{
- global $db;
- global $global_config_arr;
- global $admin_phrases;
+ global $db;
+ global $global_config_arr;
+ global $admin_phrases;
settype ( $DATA['comment_id'], "integer" );
- // MySQL-Delete-Query: Comment
+ // MySQL-Delete-Query: Comment
mysql_query ( "
- DELETE FROM
- ".$global_config_arr['pref']."news_comments
- WHERE
- comment_id = '".$DATA['comment_id']."'
- LIMIT
- 1
- ", $db );
- mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET comments = comments - 1", $db );
-
- systext( $admin_phrases[news][news_comment_deleted], $admin_phrases[common][info]);
+ DELETE FROM
+ ".$global_config_arr['pref']."news_comments
+ WHERE
+ comment_id = '".$DATA['comment_id']."'
+ LIMIT
+ 1
+ ", $db );
+ mysql_query ( "UPDATE ".$global_config_arr['pref']."counter SET comments = comments - 1", $db );
+
+ systext( $admin_phrases[news][news_comment_deleted], $admin_phrases[common][info], FALSE, $admin_phrases[icons][trash_ok] );
}
//////////////////////////
@@ -1259,6 +1285,7 @@ function db_delete_comment ( $DATA )
// Edit News
if (
isset ( $_POST['news_id'] ) &&
+ count ( $_POST['news_id'] ) == 1 &&
isset ( $_POST['sended'] ) && $_POST['sended'] == "edit" &&
isset ( $_POST['news_action'] ) && $_POST['news_action'] == "edit" &&
isset ( $_POST['news_edit'] ) && $_POST['news_edit'] == 1 &&
@@ -1280,6 +1307,7 @@ function db_delete_comment ( $DATA )
// Unset Vars
unset ( $_POST );
+ unset ( $_REQUEST );
}
// Delete News
@@ -1299,6 +1327,7 @@ function db_delete_comment ( $DATA )
// Edit Comments
elseif (
isset ( $_POST['news_id'] ) &&
+ count ( $_POST['news_id'] ) == 1 &&
isset ( $_POST['comment_id'] ) &&
isset ( $_POST['sended'] ) && $_POST['sended'] == "edit" &&
isset ( $_POST['news_action'] ) && $_POST['news_action'] == "comments" &&
@@ -1309,18 +1338,20 @@ function db_delete_comment ( $DATA )
)
{
db_edit_comment ( $_POST );
- $id = $_POST['news_id'];
+ $id = $_POST['news_id'];
// Unset Vars
unset ( $_POST );
$_POST['news_action'] = "comments";
$_POST['news_id'] = $id;
unset ( $id );
+ $FILE_SHOW_START = FALSE;
}
// Delete Comments
elseif (
isset ( $_POST['news_id'] ) &&
+ count ( $_POST['news_id'] ) == 1 &&
isset ( $_POST['comment_id'] ) &&
isset ( $_POST['sended'] ) && $_POST['sended'] == "delete" &&
isset ( $_POST['news_action'] ) && $_POST['news_action'] == "comments" &&
@@ -1329,13 +1360,14 @@ function db_delete_comment ( $DATA )
)
{
db_delete_comment ( $_POST );
- $id = $_POST['news_id'];
+ $id = $_POST['news_id'];
// Unset Vars
unset ( $_POST );
$_POST['news_action'] = "comments";
$_POST['news_id'] = $id;
unset ( $id );
+ $FILE_SHOW_START = FALSE;
}
@@ -1344,53 +1376,52 @@ function db_delete_comment ( $DATA )
//////////////////////////////
if ( $_POST['news_id'] && $_POST['news_action'] )
{
- // Edit News
- if ( $_POST['news_action'] == "edit" && count ( $_POST['news_id'] ) == 1 )
- {
- $_POST['news_id'] = $_POST['news_id'][0];
- action_edit_display_page ( action_edit_get_data ( $_POST['news_id'] ) );
- }
+ $FILE_SHOW_START = FALSE;
+ // Edit News
+ if ( $_POST['news_action'] == "edit" && count ( $_POST['news_id'] ) == 1 )
+ {
+ $_POST['news_id'] = $_POST['news_id'][0];
+ action_edit_display_page ( action_edit_get_data ( $_POST['news_id'] ) );
+ }
- // Delete News
- elseif ( $_POST['news_action'] == "delete" )
- {
+ // Delete News
+ elseif ( $_POST['news_action'] == "delete" )
+ {
$news_arr = action_delete_get_data ( $_POST['news_id'] );
- action_delete_display_page ( $news_arr );
- }
-
- // Edit Comments
- elseif ( $_POST['news_action'] == "comments" && count ( $_POST['news_id'] ) == 1 )
+ action_delete_display_page ( $news_arr );
+ }
+
+ // Edit Comments
+ elseif ( $_POST['news_action'] == "comments" && count ( $_POST['news_id'] ) == 1 )
+ {
+ $_POST['news_id'] = $_POST['news_id'][0];
+ if (
+ $_POST['news_id'] && $_POST['news_action'] == "comments" &&
+ $_POST['comment_id'] && $_POST['comment_action']
+ )
{
- $_POST['news_id'] = $_POST['news_id'][0];
- if (
- $_POST['news_id'] && $_POST['news_action'] == "comments" &&
- $_POST['comment_id'] && $_POST['comment_action']
- )
- {
- // Edit Comment
- if ( $_POST['comment_action'] == "edit" )
- {
- action_comments_edit ( $_POST );
- }
- elseif ( $_POST['comment_action'] == "delete" ) {
- action_comments_delete ( $_POST );
- } else {
- action_comments_select ( $_POST );
- }
- } else {
- action_comments_select ( $_POST );
- }
+ // Edit Comment
+ if ( $_POST['comment_action'] == "edit" ) {
+ action_comments_edit ( $_POST );
+ } elseif ( $_POST['comment_action'] == "delete" ) {
+ action_comments_delete ( $_POST );
+ } else {
+ action_comments_select ( $_POST );
+ }
+ } else {
+ action_comments_select ( $_POST );
}
+ } elseif ( $_POST['news_action'] != "delete" && count ( $_POST['news_id'] ) > 1 ) {
+ systext( "Sie können nur eine News gleichzeitig bearbeiten", $admin_phrases[common][error], TRUE, $admin_phrases[icons][error] );
+ $FILE_SHOW_START = TRUE;
+ }
}
////////////////////////////////////////
//// Display Default News List Page ////
////////////////////////////////////////
-else
+if ( $FILE_SHOW_START == TRUE )
{
- // Errors
- echo "error";
-
// Filter
$_REQUEST = default_set_filter_data ( $_REQUEST );
default_display_filter ( $_REQUEST );
diff --git a/www/admin/editor.css b/www/admin/editor.css
index 1f47472..1c6396f 100644
--- a/www/admin/editor.css
+++ b/www/admin/editor.css
@@ -11,6 +11,16 @@ div.ed_button {
div.ed_button:hover {
background-color:#A5E5A5;
}
+a.ed_button_new {
+ display:block;
+ width:22px;
+ height:22px;
+ cursor:pointer;
+ background-position: bottom right;
+}
+a.ed_button_new:hover, a.ed_button_new:focus {
+ background-position: top left;
+}
td.editor_td {
width:24px;
height:23px;
diff --git a/www/admin/editor/b.jpg b/www/admin/editor/b.jpg
new file mode 100644
index 0000000..bf13394
Binary files /dev/null and b/www/admin/editor/b.jpg differ
diff --git a/www/admin/editor/center.jpg b/www/admin/editor/center.jpg
new file mode 100644
index 0000000..8dccb49
Binary files /dev/null and b/www/admin/editor/center.jpg differ
diff --git a/www/admin/editor/cimg.jpg b/www/admin/editor/cimg.jpg
new file mode 100644
index 0000000..246c966
Binary files /dev/null and b/www/admin/editor/cimg.jpg differ
diff --git a/www/admin/editor/code.jpg b/www/admin/editor/code.jpg
new file mode 100644
index 0000000..620478c
Binary files /dev/null and b/www/admin/editor/code.jpg differ
diff --git a/www/admin/editor/color.jpg b/www/admin/editor/color.jpg
new file mode 100644
index 0000000..2d95c2f
Binary files /dev/null and b/www/admin/editor/color.jpg differ
diff --git a/www/admin/editor/email.jpg b/www/admin/editor/email.jpg
new file mode 100644
index 0000000..6ff7685
Binary files /dev/null and b/www/admin/editor/email.jpg differ
diff --git a/www/admin/editor/font.jpg b/www/admin/editor/font.jpg
new file mode 100644
index 0000000..1dda4b3
Binary files /dev/null and b/www/admin/editor/font.jpg differ
diff --git a/www/admin/editor/home.jpg b/www/admin/editor/home.jpg
new file mode 100644
index 0000000..c312935
Binary files /dev/null and b/www/admin/editor/home.jpg differ
diff --git a/www/admin/editor/i.jpg b/www/admin/editor/i.jpg
new file mode 100644
index 0000000..b683742
Binary files /dev/null and b/www/admin/editor/i.jpg differ
diff --git a/www/admin/editor/img.jpg b/www/admin/editor/img.jpg
new file mode 100644
index 0000000..809092c
Binary files /dev/null and b/www/admin/editor/img.jpg differ
diff --git a/www/admin/editor/noparse.jpg b/www/admin/editor/noparse.jpg
new file mode 100644
index 0000000..a22b4fa
Binary files /dev/null and b/www/admin/editor/noparse.jpg differ
diff --git a/www/admin/editor/quote.jpg b/www/admin/editor/quote.jpg
new file mode 100644
index 0000000..465037d
Binary files /dev/null and b/www/admin/editor/quote.jpg differ
diff --git a/www/admin/editor/s.jpg b/www/admin/editor/s.jpg
new file mode 100644
index 0000000..7434eed
Binary files /dev/null and b/www/admin/editor/s.jpg differ
diff --git a/www/admin/editor/size.jpg b/www/admin/editor/size.jpg
new file mode 100644
index 0000000..370fa3c
Binary files /dev/null and b/www/admin/editor/size.jpg differ
diff --git a/www/admin/editor/u.jpg b/www/admin/editor/u.jpg
new file mode 100644
index 0000000..678c29e
Binary files /dev/null and b/www/admin/editor/u.jpg differ
diff --git a/www/admin/editor/url.jpg b/www/admin/editor/url.jpg
new file mode 100644
index 0000000..1ee4bc9
Binary files /dev/null and b/www/admin/editor/url.jpg differ
diff --git a/www/admin/icons/error.jpg b/www/admin/icons/error.jpg
new file mode 100644
index 0000000..52a43bd
Binary files /dev/null and b/www/admin/icons/error.jpg differ
diff --git a/www/admin/icons/help.gif b/www/admin/icons/help.gif
new file mode 100644
index 0000000..973a557
Binary files /dev/null and b/www/admin/icons/help.gif differ
diff --git a/www/admin/icons/ok.jpg b/www/admin/icons/ok.jpg
new file mode 100644
index 0000000..1fe7230
Binary files /dev/null and b/www/admin/icons/ok.jpg differ
diff --git a/www/admin/icons/pointer.gif b/www/admin/icons/pointer.gif
new file mode 100644
index 0000000..fda8a44
Binary files /dev/null and b/www/admin/icons/pointer.gif differ
diff --git a/www/admin/icons/save_add.jpg b/www/admin/icons/save_add.jpg
new file mode 100644
index 0000000..94f7964
Binary files /dev/null and b/www/admin/icons/save_add.jpg differ
diff --git a/www/admin/icons/save_error.jpg b/www/admin/icons/save_error.jpg
new file mode 100644
index 0000000..5bf7b58
Binary files /dev/null and b/www/admin/icons/save_error.jpg differ
diff --git a/www/admin/icons/save_ok.jpg b/www/admin/icons/save_ok.jpg
new file mode 100644
index 0000000..9e90ee1
Binary files /dev/null and b/www/admin/icons/save_ok.jpg differ
diff --git a/www/admin/icons/save_small.gif b/www/admin/icons/save_small.gif
new file mode 100644
index 0000000..96c68fa
Binary files /dev/null and b/www/admin/icons/save_small.gif differ
diff --git a/www/admin/icons/trash_error.jpg b/www/admin/icons/trash_error.jpg
new file mode 100644
index 0000000..9010e4b
Binary files /dev/null and b/www/admin/icons/trash_error.jpg differ
diff --git a/www/admin/icons/trash_ok.jpg b/www/admin/icons/trash_ok.jpg
new file mode 100644
index 0000000..086be83
Binary files /dev/null and b/www/admin/icons/trash_ok.jpg differ
diff --git a/www/admin/img/bigpointer_down.png b/www/admin/img/bigpointer_down.png
index ce689de..5055933 100644
Binary files a/www/admin/img/bigpointer_down.png and b/www/admin/img/bigpointer_down.png differ
diff --git a/www/admin/img/bigpointer_down_grey.png b/www/admin/img/bigpointer_down_grey.png
index e07c11e..6e675c3 100644
Binary files a/www/admin/img/bigpointer_down_grey.png and b/www/admin/img/bigpointer_down_grey.png differ
diff --git a/www/admin/img/bigpointer_up.png b/www/admin/img/bigpointer_up.png
index 434d58b..011c5ad 100644
Binary files a/www/admin/img/bigpointer_up.png and b/www/admin/img/bigpointer_up.png differ
diff --git a/www/admin/img/bigpointer_up_grey.png b/www/admin/img/bigpointer_up_grey.png
index d121164..9e02269 100644
Binary files a/www/admin/img/bigpointer_up_grey.png and b/www/admin/img/bigpointer_up_grey.png differ
diff --git a/www/admin/img/login.gif b/www/admin/img/login.gif
index 1c291d3..b9b6efa 100644
Binary files a/www/admin/img/login.gif and b/www/admin/img/login.gif differ
diff --git a/www/admin/img/logout.gif b/www/admin/img/logout.gif
index 9d30d96..06c72de 100644
Binary files a/www/admin/img/logout.gif and b/www/admin/img/logout.gif differ
diff --git a/www/data/editprofil.php b/www/data/editprofil.php
index 532314d..61e7408 100644
--- a/www/data/editprofil.php
+++ b/www/data/editprofil.php
@@ -32,7 +32,7 @@
$_POST[showmail] = isset($_POST[showmail]) ? 1 : 0;
$update = "UPDATE ".$global_config_arr[pref]."user
SET user_mail = '$_POST[usermail]',
- show_mail = '$_POST[showmail]'
+ user_show_mail = '$_POST[showmail]'
WHERE user_id = $_SESSION[user_id]";
mysql_query($update, $db);
$message .= $phrases[profile_update];
@@ -52,31 +52,31 @@
{
if ( $_POST[newpwd] == $_POST[wdhpwd] )
{
- $new_salt = generate_pwd ( 10 );
- $mailpass = $_POST[newpwd];
- $codedpass = md5 ( $_POST[newpwd].$new_salt );
- unset($_POST[newpwd]);
- unset($_POST[wdhpwd]);
-
- //UPDATE PASSWORD
- $update = "UPDATE ".$global_config_arr['pref']."user
- SET user_password = '".$codedpass."',
- user_salt = '".$new_salt."'
- WHERE user_id = ".$_SESSION['user_id']."";
- mysql_query($update, $db);
- $message .= "
".$phrases[pass_update];
-
- // send email
- $template_mail = get_email_template ( "signup" );
- $template_mail = str_replace ( "{username}", stripslashes ( $_SESSION['user_name'] ), $template_mail );
- $template_mail = str_replace ( "{password}", $mailpass, $template_mail );
- $template_mail = str_replace ( "{virtualhost}", $global_config_arr['virtualhost'], $template_mail );
- $email_betreff = $phrases['pass_change'] . $global_config_arr['virtualhost'];
- if ( @send_mail ( stripslashes ( $_POST['usermail'] ), $email_betreff, $template_mail ) ) {
- $message .= "
E-Mail mit neuen Zugangsdaten wurde erfolgreich gesendet";
- } else {
- $message .= "
E-Mail mit neuen Zugangsdaten konnte nicht gesendet werden";
- }
+ $new_salt = generate_pwd ( 10 );
+ $mailpass = $_POST[newpwd];
+ $codedpass = md5 ( $_POST[newpwd].$new_salt );
+ unset($_POST[newpwd]);
+ unset($_POST[wdhpwd]);
+
+ //UPDATE PASSWORD
+ $update = "UPDATE ".$global_config_arr['pref']."user
+ SET user_password = '".$codedpass."',
+ user_salt = '".$new_salt."'
+ WHERE user_id = ".$_SESSION['user_id']."";
+ mysql_query($update, $db);
+ $message .= "
".$phrases[pass_update];
+
+ // send email
+ $template_mail = get_email_template ( "signup" );
+ $template_mail = str_replace ( "{username}", stripslashes ( $_SESSION['user_name'] ), $template_mail );
+ $template_mail = str_replace ( "{password}", $mailpass, $template_mail );
+ $template_mail = str_replace ( "{virtualhost}", $global_config_arr['virtualhost'], $template_mail );
+ $email_betreff = $phrases['pass_change'] . $global_config_arr['virtualhost'];
+ if ( @send_mail ( stripslashes ( $_POST['usermail'] ), $email_betreff, $template_mail ) ) {
+ $message .= "
E-Mail mit neuen Zugangsdaten wurde erfolgreich gesendet";
+ } else {
+ $message .= "
E-Mail mit neuen Zugangsdaten konnte nicht gesendet werden";
+ }
} else {
$message .= "
" . $phrases[pass_failed] . "
" . $phrases[pass_newwrong];
@@ -102,8 +102,8 @@
{
$index = mysql_query("SELECT * FROM ".$global_config_arr['pref']."user WHERE user_id = $_SESSION[user_id]", $db);
$user_arr = mysql_fetch_assoc($index);
- $dbshowmail = $user_arr[show_mail];
- $user_arr[show_mail] = ($user_arr[show_mail] == 1) ? "checked" : "";
+ $dbshowmail = $user_arr[user_show_mail];
+ $user_arr[user_show_mail] = ($user_arr[user_show_mail] == 1) ? "checked" : "";
// Avatar vorhanden?
if (image_exists("images/avatare/", $_SESSION[user_id]))
@@ -120,7 +120,7 @@
$template = stripslashes(mysql_result($index, 0, "user_profiledit"));
$template = str_replace("{avatar}", $user_arr[user_avatar], $template);
$template = str_replace("{email}", $user_arr[user_mail], $template);
- $template = str_replace("{email_zeigen}", $user_arr[show_mail], $template);
+ $template = str_replace("{email_zeigen}", $user_arr[user_show_mail], $template);
$template = str_replace("{username}", $user_arr[user_name], $template);
}
diff --git a/www/data/news.php b/www/data/news.php
index dd29c3a..8aa918f 100644
--- a/www/data/news.php
+++ b/www/data/news.php
@@ -18,10 +18,10 @@
while ($newshead_arr = mysql_fetch_assoc($index))
{
$newshead_arr['news_date'] = date("d.m.y" , $newshead_arr['news_date']) . " | " . date("H:i" , $newshead_arr['news_date']);
- if ( strlen ( $newshead_arr['news_title'] ) > $config_arr['news_headline_lenght'] ) {
+ if ( strlen ( $newshead_arr['news_title'] ) > $config_arr['news_headline_lenght'] && $config_arr['news_headline_lenght'] >=0 ) {
$newshead_arr['news_title'] = substr ( $newshead_arr['news_title'], 0, $config_arr['news_headline_lenght'] ) . $config_arr['news_headline_ext'];
- }
-
+ }
+
$headline = get_template ( "news_headline" );
$headline = str_replace("{datum}", $newshead_arr['news_date'], $headline);
$headline = str_replace("{url}", "#".$newshead_arr['news_id'], $headline);
@@ -39,11 +39,11 @@
while ($dlhead_arr = mysql_fetch_assoc($index))
{
$dlhead_arr['dl_date'] = date("d.m.y" , $dlhead_arr['dl_date']) . " | " . date("H:i" , $dlhead_arr['dl_date']);
- if ( strlen ( $dlhead_arr['dl_name'] ) > $config_arr['news_headline_lenght'] ) {
+ if ( strlen ( $dlhead_arr['dl_name'] ) > $config_arr['news_headline_lenght'] ) {
$dlhead_arr['dl_name'] = substr ( $dlhead_arr['dl_name'], 0, $config_arr['news_headline_lenght'] ) . $config_arr['news_headline_ext'];
- }
+ }
- $download = get_template ( "dl_quick_links" );
+ $download = get_template ( "dl_quick_links" );
$download = str_replace("{datum}", $dlhead_arr['dl_date'], $download);
$download = str_replace("{url}", "?go=dlfile&fileid=".$dlhead_arr['dl_id'], $download);
$download = str_replace("{name}", stripslashes ( $dlhead_arr['dl_name'] ), $download);
diff --git a/www/data/profil.php b/www/data/profil.php
index 26732ad..de7bf0c 100644
--- a/www/data/profil.php
+++ b/www/data/profil.php
@@ -43,7 +43,7 @@
$template = str_replace("{username}", killhtml($user_arr[user_name]), $template);
$template = str_replace("{avatar}", $user_arr[user_avatar], $template);
$template = str_replace("{email}", $user_arr[user_mail], $template);
- $template = str_replace("{reg_datum}", date("d.m.Y", $user_arr[reg_date]), $template);
+ $template = str_replace("{reg_datum}", date($global_config_arr['date'], $user_arr[user_reg_date]), $template);
$template = str_replace("{news}", $user_arr[user_news], $template);
$template = str_replace("{artikel}", $user_arr[user_artikel], $template);
$template = str_replace("{kommentare}", $user_arr[user_comments], $template);
diff --git a/www/images/partner/1_big.jpg b/www/images/partner/1_big.jpg
deleted file mode 100644
index c99f4c1..0000000
Binary files a/www/images/partner/1_big.jpg and /dev/null differ
diff --git a/www/images/partner/1_small.jpg b/www/images/partner/1_small.jpg
deleted file mode 100644
index fc61f58..0000000
Binary files a/www/images/partner/1_small.jpg and /dev/null differ
diff --git a/www/includes/adminfunctions.php b/www/includes/adminfunctions.php
index 246604b..e3026a7 100644
--- a/www/includes/adminfunctions.php
+++ b/www/includes/adminfunctions.php
@@ -261,28 +261,45 @@ function getreadonly ( $VALUE, $COMPAREWITH )
//// Systemmeldung ausgeben ////
////////////////////////////////
-function systext ( $MESSAGE, $TITLE = FALSE, $RED = FALSE )
+function get_systext ( $MESSAGE, $TITLE = FALSE, $RED = FALSE, $IMAGE = FALSE )
{
global $admin_phrases;
- if ( $TITLE == FALSE ) {
- $TITLE = $admin_phrases[common][system_message];
- }
+ if ( $TITLE == FALSE ) {
+ $TITLE = $admin_phrases[common][system_message];
+ }
- if ( $RED == TRUE ) {
- $class = "line_red";
- } else {
- $class = "line";
- }
-
+ if ( $RED == TRUE ) {
+ $class = "line_red";
+ } else {
+ $class = "line";
+ }
- echo '
-
- '.$TITLE.' |
- '.$MESSAGE.' |
- |
-
+ if ( $IMAGE == FALSE ) {
+ return '
+
+ '.$TITLE.' |
+ '.$MESSAGE.' |
+ |
+
+ ';
+ } else {
+ return '
+
+ '.$TITLE.' |
+
+ '.$IMAGE.' |
+ '.$MESSAGE.' |
+
+ |
+
';
+ }
+}
+
+function systext ( $MESSAGE, $TITLE = FALSE, $RED = FALSE, $IMAGE = FALSE )
+{
+ echo get_systext ( $MESSAGE, $TITLE, $RED, $IMAGE );
}
/////////////////////////////////
@@ -382,7 +399,9 @@ function create_editor($name, $text="", $width="", $height="", $class="", $do_sm
}
if ($class != "") {
- $class2 = 'class="'.$class.'"';
+ $class2 = 'class="nomonospace '.$class.'"';
+ } else {
+ $class2 = 'class="nomonospace"';
}
$style = $name2.' '.$class2.' style="'.$width2.' '.$height2.'"';
@@ -426,27 +445,27 @@ function create_editor($name, $text="", $width="", $height="", $class="", $do_sm
}
$buttons = "";
- $buttons .= create_editor_button('images/icons/bold.gif', "B", "fett", "insert('$name', '[b]', '[/b]')");
- $buttons .= create_editor_button('images/icons/italic.gif', "I", "kursiv", "insert('$name', '[i]', '[/i]')");
- $buttons .= create_editor_button('images/icons/underline.gif', "U", "unterstrichen", "insert('$name','[u]','[/u]')");
- $buttons .= create_editor_button('images/icons/strike.gif', "S", "durgestrichen", "insert('$name', '[s]', '[/s]')");
+ $buttons .= create_editor_button_new('admin/editor/b.jpg', "B", "fett", "insert('$name', '[b]', '[/b]')");
+ $buttons .= create_editor_button_new('admin/editor/i.jpg', "I", "kursiv", "insert('$name', '[i]', '[/i]')");
+ $buttons .= create_editor_button_new('admin/editor/u.jpg', "U", "unterstrichen", "insert('$name','[u]','[/u]')");
+ $buttons .= create_editor_button_new('admin/editor/s.jpg', "S", "durgestrichen", "insert('$name', '[s]', '[/s]')");
$buttons .= create_editor_seperator();
- $buttons .= create_editor_button('images/icons/center.gif', "CENTER", "zentriert", "insert('$name', '[center]', '[/center]')");
+ $buttons .= create_editor_button_new('admin/editor/center.jpg', "CENTER", "zentriert", "insert('$name', '[center]', '[/center]')");
$buttons .= create_editor_seperator();
- $buttons .= create_editor_button('images/icons/font.gif', "FONT", "Schriftart", "insert_com('$name', 'font', 'Bitte gib die gewünschte Schriftart ein:', '')");
- $buttons .= create_editor_button('images/icons/color.gif', "COLOR", "Schriftfarbe", "insert_com('$name', 'color', 'Bitte gib die gewünschte Schriftfarbe (englisches Wort) ein:', '')");
- $buttons .= create_editor_button('images/icons/size.gif', "SIZE", "Schriftgröße", "insert_com('$name', 'size', 'Bitte gib die gewünschte Schriftgröße (Zahl von 0-7) ein:', '')");
+ $buttons .= create_editor_button_new('admin/editor/font.jpg', "FONT", "Schriftart", "insert_com('$name', 'font', 'Bitte gib die gewünschte Schriftart ein:', '')");
+ $buttons .= create_editor_button_new('admin/editor/color.jpg', "COLOR", "Schriftfarbe", "insert_com('$name', 'color', 'Bitte gib die gewünschte Schriftfarbe (englisches Wort) ein:', '')");
+ $buttons .= create_editor_button_new('admin/editor/size.jpg', "SIZE", "Schriftgröße", "insert_com('$name', 'size', 'Bitte gib die gewünschte Schriftgröße (Zahl von 0-7) ein:', '')");
$buttons .= create_editor_seperator();
- $buttons .= create_editor_button('images/icons/img.gif', "IMG", "Bild einfügen", "insert_mcom('$name', '[img]', '[/img]', 'Bitte gib die URL zu der Grafik ein:', 'http://')");
- $buttons .= create_editor_button('images/icons/cimg.gif', "CIMG", "Content-Image einfügen", "insert_mcom('$name', '[cimg]', '[/cimg]', 'Bitte gib den Namen des Content-Images (mit Endung) ein:', '')");
+ $buttons .= create_editor_button_new('admin/editor/img.jpg', "IMG", "Bild einfügen", "insert_mcom('$name', '[img]', '[/img]', 'Bitte gib die URL zu der Grafik ein:', 'http://')");
+ $buttons .= create_editor_button_new('admin/editor/cimg.jpg', "CIMG", "Content-Image einfügen", "insert_mcom('$name', '[cimg]', '[/cimg]', 'Bitte gib den Namen des Content-Images (mit Endung) ein:', '')");
$buttons .= create_editor_seperator();
- $buttons .= create_editor_button('images/icons/url.gif', "URL", "Link einfügen", "insert_com('$name', 'url', 'Bitte gib die URL ein:', 'http://')");
- $buttons .= create_editor_button('images/icons/home.gif', "HOME", "Projektinternen Link einfügen", "insert_com('$name', 'home', 'Bitte gib den projektinternen Verweisnamen ein:', '')");
- $buttons .= create_editor_button('images/icons/email.gif', "@", "Email-Link einfügen", "insert_com('$name', 'email', 'Bitte gib die Email-Adresse ein:', '')");
+ $buttons .= create_editor_button_new('admin/editor/url.jpg', "URL", "Link einfügen", "insert_com('$name', 'url', 'Bitte gib die URL ein:', 'http://')");
+ $buttons .= create_editor_button_new('admin/editor/home.jpg', "HOME", "Projektinternen Link einfügen", "insert_com('$name', 'home', 'Bitte gib den projektinternen Verweisnamen ein:', '')");
+ $buttons .= create_editor_button_new('admin/editor/email.jpg', "@", "Email-Link einfügen", "insert_com('$name', 'email', 'Bitte gib die Email-Adresse ein:', '')");
$buttons .= create_editor_seperator();
- $buttons .= create_editor_button('images/icons/code.gif', "C", "Code-Bereich einfügen", "insert('$name', '[code]', '[/code]')");
- $buttons .= create_editor_button('images/icons/quote.gif', "Q", "Zitat einfügen", "insert('$name', '[quote]', '[/quote]')");
- $buttons .= create_editor_button('images/icons/noparse.gif', "N", "Nicht umzuwandelnden Bereich einfügen", "insert('$name', '[noparse]', '[/noparse]')");
+ $buttons .= create_editor_button_new('admin/editor/code.jpg', "C", "Code-Bereich einfügen", "insert('$name', '[code]', '[/code]')");
+ $buttons .= create_editor_button_new('admin/editor/quote.jpg', "Q", "Zitat einfügen", "insert('$name', '[quote]', '[/quote]')");
+ $buttons .= create_editor_button_new('admin/editor/noparse.jpg', "N", "Nicht umzuwandelnden Bereich einfügen", "insert('$name', '[noparse]', '[/noparse]')");
$textarea = '
@@ -495,6 +514,29 @@ function create_editor_button($img_url, $alt, $title, $insert)
return $button;
}
+////////////////////////////////
+//// Create textarea Button ////
+////////////////////////////////
+
+function create_editor_button_new($img_url, $alt, $title, $insert)
+{
+ global $global_config_arr;
+ $javascript = 'javascript:'.$insert;
+
+ $button = '
+
+
+
+
+ | ';
+ $button = str_replace("{img_url}", $global_config_arr[virtualhost].$img_url, $button);
+ $button = str_replace("{alt}", $alt, $button);
+ $button = str_replace("{title}", $title, $button);
+ $button = str_replace("{javascript}", $javascript, $button);
+
+ return $button;
+}
+
////////////////////////////////////
//// Create textarea Seperator ////
@@ -511,17 +553,36 @@ function create_editor_seperator()
//// Insert Tooltip ////
////////////////////////
-function insert_tt($title,$text,$form)
-{
- return '
-'.$title.'
-
-
- '.$title.'
'.$text.'
-
-
-
- ';
+function insert_tt ( $TITLE, $TEXT, $FORM_ID, $NEW_LINE = TRUE, $INSERT = TRUE, $BOLD_TITLE = TRUE, $SHOW_TITLE = TRUE )
+{
+ if ( $NEW_LINE == TRUE ) {
+ $span_start = '';
+ $span_end = '';
+ }
+ if ( $INSERT == TRUE ) {
+ $insert_button = '
+ ';
+ }
+ if ( $SHOW_TITLE == TRUE ) {
+ $first_title = $TITLE." ";
+ }
+ if ( $BOLD_TITLE == TRUE ) {
+ $second_title = " ".$TITLE."";
+ } else {
+ $second_title = " ".$TITLE;
+ }
+
+ $template = $span_start.'
+ '.$first_title.'
+
+
+
+ '.$second_title.'
'.$TEXT.'
+
+ '.$insert_button.$span_end.'
+ ';
+
+ return $template;
}
////////////////////////////////
diff --git a/www/includes/bbcodefunctions.php b/www/includes/bbcodefunctions.php
index ae9e186..acedc13 100644
--- a/www/includes/bbcodefunctions.php
+++ b/www/includes/bbcodefunctions.php
@@ -1,7 +1,4 @@
= 1 ) {
- include ( FS2_ROOT_PATH . "data/articles.php" );
- } elseif ( $GOTO == "dl" && usset ( $_GET['fileid'] ) && isset ( $_GET['dl'] ) ) {
- $template = "";
- } else {
- include ( FS2_ROOT_PATH . "data/404.php" );
- }
+ $index = mysql_query ( "SELECT COUNT(article_id) AS 'number' FROM ".$global_config_arr['pref']."articles WHERE article_url = '".$GOTO."'", $db );
+
+ // Display Content
+ if ( file_exists ( "data/".$GOTO.".php" ) ) {
+ include ( FS2_ROOT_PATH . "data/".$GOTO.".php" );
+ } elseif ( mysql_result ( $index, 0, "number") >= 1 ) {
+ include ( FS2_ROOT_PATH . "data/articles.php" );
+ } elseif ( $GOTO == "dl" && isset ( $_GET['fileid'] ) && isset ( $_GET['dl'] ) ) {
+ $template = "";
+ } else {
+ include ( FS2_ROOT_PATH . "data/404.php" );
+ }
- // Replace Virtualhost & Kill Resources
- $template = killbraces($template);
+ // Replace Virtualhost & Kill Resources
+ $template = killbraces($template);
- // Return Content
- return $template;
+ // Return Content
+ return $template;
}
diff --git a/www/phrases/admin_phrases_de.php b/www/phrases/admin_phrases_de.php
index cb52cd3..22e3ad8 100644
--- a/www/phrases/admin_phrases_de.php
+++ b/www/phrases/admin_phrases_de.php
@@ -8,6 +8,7 @@
$admin_phrases[common][info] = "Information";
$admin_phrases[common][error] = "Es trat ein Fehler auf";
$admin_phrases[common][changes_saved] = "Änderungen wurden gespeichert";
+$admin_phrases[common][changes_not_saved] = "Änderungen wurden nicht gespeichert";
$admin_phrases[common][affected_rows] = "Betroffene Datensätze";
$admin_phrases[common][image_0] = "Bild wurde erfolgreich hochgeladen";
@@ -50,7 +51,7 @@
$admin_phrases[common][kib] = "KiB";
$admin_phrases[common][mib] = "MiB";
-$admin_phrases[common][arrow] = '';
+$admin_phrases[common][arrow] = '';
$admin_phrases[common][save_long] = "Änderungen speichern";
$admin_phrases[common][do_button] = "Ausführen";
$admin_phrases[common][do_button_long] = "Aktion ausführen";
@@ -92,6 +93,22 @@
$admin_phrases[common][replace_img] = "Nur auswählen, wenn das bisherige Bild überschrieben werden soll!";
+
+////////////
+// icons //
+////////////
+
+$admin_phrases[icons][error] = '';
+$admin_phrases[icons][ok] = '';
+$admin_phrases[icons][arrow] = '';
+$admin_phrases[icons][save_small] = '';
+$admin_phrases[icons][save_ok] = '';
+$admin_phrases[icons][save_add] = '';
+$admin_phrases[icons][save_error] = '';
+$admin_phrases[icons][trash_ok] = '';
+$admin_phrases[icons][trash_error] = '';
+
+
////////////
// menu //
////////////
@@ -388,6 +405,7 @@
$admin_phrases[news][news_text] = "Text";
$admin_phrases[news][news_add_button] = "News hinzufügen";
$admin_phrases[news][news_added] = "News wurde erfolgreich hinzugefügt";
+$admin_phrases[news][news_not_added] = "News wurde nicht hinzugefügt";
$admin_phrases[news][news_link_add] = "Link hinzufügen";
$admin_phrases[news][news_link_title] = "Titel";
@@ -449,11 +467,11 @@
$admin_phrases[news][news_edit_entries_found] = "Datensätze gefunden";
$admin_phrases[news][news_delete_title] = "News löschen";
-$admin_phrases[news][news_delete_view_news] = "News komplett betrachten";
-$admin_phrases[news][news_delete_question] = "Soll diese News (inklusive Links und Kommentaren) wirklich gelöscht werden?";
+$admin_phrases[news][news_delete_view_news] = "anzeigen";
+$admin_phrases[news][news_delete_question] = "Soll(en) die folgende(n) News (inklusive Links und Kommentaren) wirklich unwiderruflich gelöscht werden?";
-$admin_phrases[news][news_deleted] = "News wurde erfolgreich gelöscht";
-$admin_phrases[news][news_not_deleted] = "News wurde nicht gelöscht";
+$admin_phrases[news][news_deleted] = "News wurde(n) erfolgreich gelöscht";
+$admin_phrases[news][news_not_deleted] = "News wurde(n) nicht gelöscht";
$admin_phrases[news][news_comment_deleted] = "Kommentar wurde erfolgreich gelöscht";
diff --git a/www/phrases/phrases_de.php b/www/phrases/phrases_de.php
index 1a0971a..a4e2e77 100644
--- a/www/phrases/phrases_de.php
+++ b/www/phrases/phrases_de.php
@@ -42,6 +42,9 @@
$phrases[avatar_to_big] = "Avatar konnte nicht hocgeladen werden. Die Datei ist zu groß";
$phrases[profile_update] = "Profil wurde aktualisiert.";
$phrases[pass_update] = "Passwort wurde geändert.";
+$phrases[pass_failed] = "Passwort ändern fehlgeschlagen";
+$phrases[pass_newwrong] = "Das gewünschte Passwort wurde nicht zweimal gleich eingegeben";
+$phrases[pass_oldwrong] = "Das bisherige Passwort wurde nicht korrekt eingegeben";
$phrases[no_avatar] = "Kein Bild gewählt";
$phrases[user_not_exist] = "Dieser User existiert nicht";
$phrases[user_exists] = "Username existiert bereits";