From f02f45530aecaa71f99cb57d57e3a4b806214be5 Mon Sep 17 00:00:00 2001 From: Thoronador Date: Thu, 11 Jul 2013 22:17:46 +0200 Subject: [PATCH 01/45] remove call to exec() and replace it by alternative functions The exec() function is usually disabled in most hosted environments, because of security concerns. Furthermore the call to 'whoami' won't work on Windows servers running PHP, so we should use a more portable way of determining the current user's name. Yes, people should usually avoid Windows as a server system OS, but nevertheless there are PHP binaries for Windows, too, so we should try to support that as well. --- www/admin/admin_allphpinfo.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/www/admin/admin_allphpinfo.php b/www/admin/admin_allphpinfo.php index a60c921..364e80c 100644 --- a/www/admin/admin_allphpinfo.php +++ b/www/admin/admin_allphpinfo.php @@ -31,7 +31,23 @@ '.$FD->text('page', 'phpinfo_phpuser').': - '.exec('whoami').' + '; + //Do the required POSIX functions to get the current user's name exist? + // They usually do on Linux but not on Windows systems. + if (function_exists('posix_getuid') && function_exists('posix_getpwuid')) + { + $user_info = posix_getpwuid(posix_getuid()); + echo htmlspecialchars($user_info['name']); + } + else + { + /* No POSIX functions available, boo! Falling back to get_current_user, + although that can (and often will) give incorrect result, but that's + the best guess so far. If that bugs you, run your server on a POSIX- + compatible system or enable PHP's POSIX extension. */ + echo htmlspecialchars(get_current_user()); + } + echo ' From d1c7eed06e3107098c186fbc1edccd369b875f65 Mon Sep 17 00:00:00 2001 From: Sweil Date: Sat, 20 Jul 2013 17:20:33 +0200 Subject: [PATCH 02/45] Update README description for alix6-bugfixes --- README | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index ff52f08..a60b652 100644 --- a/README +++ b/README @@ -1,9 +1,10 @@ Development branches: - - alix6_neu: This is the most recent branch for the next release alix6. Use this a base of your active development. - - master: This will always be the branch of the latest release. After a new release the - specific branch will be merged into this one. + - alix6-bugfixes: This is the branch with bug-fixes for alix6. Use this a base of your development for alix6. + - alix6_neu: This is the base branch of alix6. bugfixes will be merged into it, if occur. + - master: This will always be the branch of the latest release. After a new release the + specific branch will be merged into this one. Test branches: - - future: This branch is for testing purposes only. I use it to test some long-distance changes. \ No newline at end of file + - future: This branch is for testing purposes only. I use it to test some long-distance changes. From 2fd070594a91d57afbf368d1bde616ce0d79a8b7 Mon Sep 17 00:00:00 2001 From: Thoronador Date: Sat, 20 Jul 2013 23:42:34 +0200 Subject: [PATCH 03/45] update copyright notice of Frogsystem 2 --- www/includes/indexfunctions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/includes/indexfunctions.php b/www/includes/indexfunctions.php index abe395a..46fed9c 100644 --- a/www/includes/indexfunctions.php +++ b/www/includes/indexfunctions.php @@ -1164,7 +1164,7 @@ function clean_timed_preview_images () { /////////////////////////////// function get_copyright () { - return 'Powered by Frogsystem 2 © 2007 - 2011 Frogsystem-Team'; + return 'Powered by Frogsystem 2 © 2007 - 2013 Frogsystem-Team'; } @@ -1220,7 +1220,7 @@ function copyright () $copyright = (string) $template_copyright; if (strpos($copyright, $template_copyright->getOpener().'copyright'.$template_copyright->getCloser()) == FALSE - || strpos(get_copyright(), 'Frogsystem 2' ) == FALSE || strpos(get_copyright(), '© 2007 - 2011 Frogsystem-Team') == FALSE + || strpos(get_copyright(), 'Frogsystem 2' ) == FALSE || strpos(get_copyright(), '© 2007 - 2013 Frogsystem-Team') == FALSE || strpos(get_copyright(), 'Powered by' ) == FALSE || strpos(get_copyright(), 'frogsystem.de') == FALSE ) { $FD->setConfig('style', 'default'); From 28ae31376ef6cf84a1dc09987962fa9a5ee9d779 Mon Sep 17 00:00:00 2001 From: Sweil Date: Sun, 21 Jul 2013 00:10:45 +0200 Subject: [PATCH 04/45] add ifmodule for mod_rewrite Signed-off-by: Sweil --- www/.htaccess | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/www/.htaccess b/www/.htaccess index 7233067..66dedcf 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -2,10 +2,12 @@ ErrorDocument 403 http://localhost/fs2/www/403.html ErrorDocument 404 http://localhost/fs2/www/404.html -# Aktiviere RewriteEngine (noetig für alle Rewrites) -RewriteEngine On + + # Aktiviere RewriteEngine + RewriteEngine On -# SEO-URLs -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule ^(.+)\.html$ index.php?seoq=$1 [L,QSA] + # SEO-URLs + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.+)\.html$ index.php?seoq=$1 [L,QSA] + From c55c7109e08a2b57823ab47b38e01fb9e8d5932b Mon Sep 17 00:00:00 2001 From: Sweil Date: Sun, 21 Jul 2013 01:00:56 +0200 Subject: [PATCH 05/45] fixed cimg link Signed-off-by: Sweil --- www/includes/fscode.php | 56 ++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/www/includes/fscode.php b/www/includes/fscode.php index 8501615..166d56f 100644 --- a/www/includes/fscode.php +++ b/www/includes/fscode.php @@ -90,7 +90,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar if ($flags['nohtmlatall']) { $fscode->addParser ('htmlblock', 'killhtml'); } - + if ($flags['washtml']) { //TODO: washtml http://www.ubixis.com/washtml/ // $bbcode->addParser (array ('block', 'inline', 'link', 'listitem', 'htmlblock'), 'washtml'); @@ -148,7 +148,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('i', 'simple_replace', null, array ('start_tag' => '', 'end_tag' => ''), 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); } - + // u if (in_array('u', $to_html)) { $fscode->addCode ('u', 'simple_replace', null, array ('start_tag' => '', 'end_tag' => ''), @@ -156,7 +156,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar } elseif (in_array('u', $to_text)) { $fscode->addCode ('u', 'simple_replace', null, array ('start_tag' => '', 'end_tag' => ''), 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); - } + } // s if (in_array('s', $to_html)) { @@ -166,7 +166,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('s', 'simple_replace', null, array ('start_tag' => '', 'end_tag' => ''), 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); } - + // center if (in_array('center', $to_html)) { $fscode->addCode ('center', 'simple_replace', null, array ('start_tag' => '

', 'end_tag' => '

'), @@ -185,7 +185,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('url', 'usecontent?', 'do_fscode_url', array ('usecontent_param' => 'default', 'text' => true), 'link', array ('listitem', 'block', 'inline', 'htmlblock'), array ('link')); } - + // home if (in_array('home', $to_html)) { $fscode->addCode ('home', 'usecontent?', 'do_fscode_homelink', array ('usecontent_param' => 'default', 'fullurl' => $flags['full_urls']), @@ -194,7 +194,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('home', 'usecontent?', 'do_fscode_homelink', array ('usecontent_param' => 'default', 'text' => true, 'fullurl' => $flags['full_urls']), 'link', array ('listitem', 'block', 'inline', 'htmlblock'), array ('link')); } - + // email if (in_array('email', $to_html)) { $fscode->addCode ('email', 'usecontent?', 'do_fscode_email', array ('usecontent_param' => 'default'), @@ -203,7 +203,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('email', 'usecontent?', 'do_fscode_email', array ('usecontent_param' => 'default', 'text' => true), 'link', array ('listitem', 'block', 'inline', 'htmlblock'), array ('link')); } - + // font if (in_array('font', $to_html)) { $fscode->addCode ('font', 'callback_replace', 'do_fscode_fcs', array ('type' => 'font'), @@ -221,7 +221,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('color', 'callback_replace', 'simple_replace_ignore_attributs', array ('start_tag' => '', 'end_tag' => ''), 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); } - + // size if (in_array('size', $to_html)) { $fscode->addCode ('size', 'callback_replace', 'do_fscode_fcs', array ('type' => 'size'), @@ -239,7 +239,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('img', 'usecontent?', 'do_fscode_img', array ('usecontent_param' => 'default', 'text' => true), 'image', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); } - + // cimg if (in_array('cimg', $to_html)) { $fscode->addCode ('cimg', 'usecontent?', 'do_fscode_cimg', array ('usecontent_param' => 'default'), @@ -248,7 +248,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('cimg', 'usecontent?', 'do_fscode_cimg', array ('usecontent_param' => 'default', 'text' => true), 'image', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); } - + // fscode if (in_array('fscode', $to_html) || in_array('fscode', $to_text)) { $fscode->addCode ('fscode', 'simple_replace', null, array ('start_tag' => '', 'end_tag' => ''), @@ -258,11 +258,11 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar // nofscode if (in_array('nofscode', $to_html) || in_array('nofscode', $to_text)) { $fscode->addCode ('nofscode', 'usecontent', 'simple_usecontent_replace', array ('start_tag' => '', 'end_tag' => ''), - 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); + 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); $fscode->addCode ('noparse', 'usecontent', 'simple_usecontent_replace', array ('start_tag' => '', 'end_tag' => ''), 'inline', array ('listitem', 'block', 'inline', 'link', 'htmlblock'), array ()); } - + // html $fscode->setCodeFlag ('html', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT); if (in_array('html', $to_html)) { @@ -272,7 +272,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('html', 'usecontent', 'strip_tags', array (), 'htmlblock', array ('list', 'listitem', 'block', 'inline', 'link'), array ()); } - + // nohtml if (in_array('nohtml', $to_html) || in_array('nohtml', $to_text)) { $fscode->addCode ('nohtml', 'callback_replace', 'killhtml', array (), @@ -287,7 +287,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('list', 'callback_replace', 'do_fscode_textlists', array (), 'list', array ('block', 'listitem', 'htmlblock'), array ('link')); } - + if (in_array('list', $to_html) || in_array('list', $to_text)) { $fscode->setCodeFlag ('list', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT); } @@ -304,7 +304,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('numlist', 'callback_replace', 'do_fscode_textlists', array (), 'list', array ('block', 'listitem', 'htmlblock'), array ('link')); } - + if (in_array('numlist', $to_html) || in_array('numlist', $to_text)) { $fscode->setCodeFlag ('numlist', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT); } @@ -347,7 +347,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->addCode ('code', 'usecontent', 'do_fscode_code', array ('text' => true), 'code', array ('listitem', 'block', 'inline', 'htmlblock'), array ('link')); } - + if (in_array('code', $to_html) || in_array('code', $to_text)) { $fscode->setCodeFlag ('code', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT); $fscode->setCodeFlag ('code', 'paragraph_type', BBCODE_PARAGRAPH_ALLOW_INSIDE); @@ -384,7 +384,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $fscode->setCodeFlag ('video', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT); $fscode->setCodeFlag ('player', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT); } - + // FSCode Tag } elseif (!$flags['nofscodeatall']) { // fscode @@ -392,7 +392,7 @@ function parse_fscode($TEXT, $flags = array(), $to_html = array(), $to_text = ar $bbcode->setCodeFlag ('fscode', 'paragraphs', true); $fscode->addCode ('html', 'usecontent', 'simple_usecontent_replace', array ('start_tag' => '', 'end_tag' => ''), 'htmlblock', array ('listitem', 'block', 'inline', 'link'), array ()); - + } elseif (in_array('fscode', $to_text)) { $fscode->addCode ('html', 'usecontent', 'strip_tags', array (), 'htmlblock', array ('listitem', 'block', 'inline', 'link'), array ()); @@ -618,20 +618,31 @@ function do_fscode_img ($action, $attributes, $content, $params, $node_object) { if (count($content_arr) == 1) { $content_arr[1] = $content_arr[0]; } - // title shall be same like alt + // title shall be same like alt if (count($content_arr) == 3 && strlen($content_arr[2]) == 0) { $content_arr[2] = $content_arr[1]; } $title_full = isset ($content_arr[2]) ? ' title="'.$content_arr[2].'"' : ''; + // safe align=left/right/center + if (isset($attributes['default']) && !in_array($attributes['default'], array('left', 'right', 'center'))) { + unset($attributes['default']); + } + + // safe align=left/right/center + if (isset($attributes['default']) && !in_array($attributes['default'], array('left', 'right', 'center'))) { + unset($attributes['default']); + } + // Return html or text - if (isset($params['text']) && $params['text'] === true) + if (isset($params['text']) && $params['text'] === true) { return (isset($content_arr[2])) ? $FD->text('frontend', 'image').': '.$content_arr[2]. ' ('.$content_arr[0].')' : $FD->text('frontend', 'image').': '.$content_arr[0]; - else + } else { if (!isset ($attributes['default'])) return ''.$content_arr[1].''; else return ''.$content_arr[1].''; + } } // Create an image from local database @@ -639,11 +650,10 @@ function do_fscode_cimg ($action, $attributes, $content, $params, $node_object) global $FD; // Extend Content Image Url - $content .= $FD->cfg('virtualhost').'media/content/'; + $content = $FD->cfg('virtualhost').'media/content/'.$content; // Call function for img fscode return do_fscode_img($action, $attributes, $content, $params, $node_object); - } // create text lists From 0b41137e02e04e262adc371ccdf0485bc58ae7ac Mon Sep 17 00:00:00 2001 From: Sweil Date: Thu, 1 Aug 2013 18:46:42 +0200 Subject: [PATCH 06/45] fixed wrong lang-text references Signed-off-by: Sweil --- www/admin/admin_editor_smilies.php | 2 +- www/admin/admin_group_admin.php | 4 ++-- www/admin/admin_player_edit.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/admin/admin_editor_smilies.php b/www/admin/admin_editor_smilies.php index d971308..0572a74 100644 --- a/www/admin/admin_editor_smilies.php +++ b/www/admin/admin_editor_smilies.php @@ -248,7 +248,7 @@ diff --git a/www/admin/admin_group_admin.php b/www/admin/admin_group_admin.php index 35c3021..4d99995 100644 --- a/www/admin/admin_group_admin.php +++ b/www/admin/admin_group_admin.php @@ -143,7 +143,7 @@ // SQL-Delete-Query $FD->sql()->conn()->exec (' DELETE FROM '.$FD->config('pref')."user_groups - WHERE user_group_id = '".$_POST['user_group_id']."' + WHERE user_group_id = '".$_POST['user_group_id']."' AND user_group_id > 1"); $message = 'Gruppe wurde erfolgreich gelöscht'; @@ -545,7 +545,7 @@ diff --git a/www/admin/admin_player_edit.php b/www/admin/admin_player_edit.php index d37b42f..2b6c8dd 100644 --- a/www/admin/admin_player_edit.php +++ b/www/admin/admin_player_edit.php @@ -370,7 +370,7 @@ @@ -464,7 +464,7 @@ @@ -472,7 +472,7 @@ From 85adbbe9bca3a288dbb120e526b22114c88a9d92 Mon Sep 17 00:00:00 2001 From: Sweil Date: Sun, 12 Jan 2014 19:56:55 +0100 Subject: [PATCH 07/45] fixed bug with "new" version of jQuery Signed-off-by: Sweil --- www/admin/templates/admin_news.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/www/admin/templates/admin_news.tpl b/www/admin/templates/admin_news.tpl index 680cf2b..ada192e 100644 --- a/www/admin/templates/admin_news.tpl +++ b/www/admin/templates/admin_news.tpl @@ -166,11 +166,11 @@
- <!--COMMON::up-->  - <!--COMMON::down--> + <!--COMMON::up-->  + <!--COMMON::down-->     - <!--COMMON::edit-->  - <!--COMMON::delete--> + <!--COMMON::edit-->  + <!--COMMON::delete-->
@@ -245,7 +245,7 @@ '; - // Create jQuery-Lines + // Create jQuery-Lines $template_jquery = ''; - $template_jquery_ui = ''; + // $template_jquery_ui = ''; // Get HTML-Matrix $theTemplate->load('MATRIX'); @@ -410,7 +410,7 @@ function get_canonical_url() { ///////////////////// function get_content ($GOTO) { - global $FD, $sql; + global $FD; // Display Content initstr($template); @@ -464,7 +464,7 @@ function get_content ($GOTO) //////////////////////////////////// function tpl_functions_init ($TEMPLATE) { - global $sql, $NAV, $APP, $FD; + global $NAV, $APP, $FD; // data arrays $NAV = array(); @@ -481,8 +481,6 @@ function tpl_functions_init ($TEMPLATE) /////////////////////////////// function tpl_functions ($TEMPLATE, $COUNT, $filter=array(), $loopend_escape = true) { - global $sql; - // hardcoded functions // this is the only way atm $functions = array( @@ -596,7 +594,7 @@ function get_all_tpl_functions() ////////////////////// function load_applets() { - global $sql, $FD; + global $FD; // Load Applets from DB $applet_data = $FD->sql()->conn()->query( @@ -608,7 +606,7 @@ function load_applets() // Write Applets into Array & get Applet Template initstr($template); $new_applet_data = array(); - foreach ($applet_data as $key => $entry) { + foreach ($applet_data as $entry) { // prepare data $entry['applet_file'] .= '.php'; settype($entry['applet_output'], 'boolean'); @@ -628,11 +626,8 @@ function load_applets() ////////////////////// //// Load Applets //// ////////////////////// -function load_an_applet($file, $output, $args) { - - global $FD; - global $sql; - +function load_an_applet($file, $output, $args) +{ // Setup $SCRIPT Var unset($SCRIPT, $template); $SCRIPT['argc'] = array_unshift($args, $file); @@ -695,7 +690,7 @@ function tpl_func_snippets($original, $main_argument, $other_arguments) ///////////////////////// function tpl_func_applets($original, $main_argument, $other_arguments) { - global $APP, $sql, $FD; + global $APP; // Applet does not exists if (!isset($APP[$main_argument])) { @@ -801,9 +796,7 @@ function tpl_func_url($original, $main_argument, $other_arguments) // Example: // $URL(download[cat_id=4 keyword=test 1]) - global $FD; - - // compute Arguments + // compute arguments $other_arguments = !empty($other_arguments) ? explode(' ', $other_arguments) : array(); // check each param @@ -1000,8 +993,6 @@ function forward_aliases ( $GOTO ) /////////////////// function count_all ( $GOTO ) { - global $FD; - $hit_year = date ( 'Y' ); $hit_month = date ( 'm' ); $hit_day = date ( 'd' ); diff --git a/www/includes/templatefunctions.php b/www/includes/templatefunctions.php index 418ec16..8623ae7 100644 --- a/www/includes/templatefunctions.php +++ b/www/includes/templatefunctions.php @@ -604,8 +604,6 @@ function get_footer_line ( $EDITOR_NAME, $STYLE, $HIGHLIGHTER, $FILE, $MANYFILES ///////////////////////////// function get_original_array ( $EDITOR_NAME, $FILE, $ROWS, $COLS ) { - global $FD; - if ( file_exists ( FS2_ROOT_PATH . 'styles/default/' . $FILE ) ) { $original['button'] = '
@@ -640,8 +638,6 @@ function get_original_array ( $EDITOR_NAME, $FILE, $ROWS, $COLS ) //////////////////////////////// function create_templateeditor ( $editor_arr, $HIGHLIGHTER, $FILE, $MANYFILES ) { - global $FD; - // Get Tag-Menu $help_template = get_taglist ( isset($editor_arr['help'])?$editor_arr['help']:array(), $editor_arr['name'] ); From c26d2bddd26ee14940353b3995c13a31239fb0e0 Mon Sep 17 00:00:00 2001 From: Thoronador Date: Fri, 18 Apr 2014 22:38:55 +0200 Subject: [PATCH 34/45] translate German comments in template class --- www/libs/class_template.php | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/www/libs/class_template.php b/www/libs/class_template.php index 0a562e6..81acd4c 100644 --- a/www/libs/class_template.php +++ b/www/libs/class_template.php @@ -1,5 +1,5 @@ alle Sections in den Cache laden + // If the section cache has not been filled yet => load all sections into cache if ( count ( $this->sections ) <= 0 ) { - $file_path = FS2_ROOT_PATH . 'styles/' . $this->getStyle() . '/' . $this->getFile (); // Pfad zur Template-Datei - $ACCESS = new fileaccess (); // Object für Dateizugriff erzeugen - $search_expression = '/(.*)/Uis'; // Regulärer Ausruck um Sections auszuwählen - $number_of_sections = preg_match_all ( $search_expression, $ACCESS->getFileData($file_path), $sections ); // Regulären Ausruck ausführen, Anzahl in $number_of_sections, Inhalte in $sections + $file_path = FS2_ROOT_PATH . 'styles/' . $this->getStyle() . '/' . $this->getFile (); // Path of Template file + $ACCESS = new fileaccess (); // Create object for file access + $search_expression = '/(.*)/Uis'; // Regular expression to select Sections + $number_of_sections = preg_match_all ( $search_expression, $ACCESS->getFileData($file_path), $sections ); // apply regular expression, count into $number_of_sections, contents into $sections $this->setSections ( array_flip ( $sections[1] ) ); // array_flip damit die Keys auch die Section-Namen sind - $this->setSectionsContent ( $sections[2] ); // Section Inhalte speichern + $this->setSectionsContent ( $sections[2] ); // save Section contents } - // Section-Cache wurde bereits befüllt => einfach auslesen + // Section Cache already filled => just read it if ( $this->sectionExists ( $section ) ) { $this->setTemplate ( $this->getSectionContent ( $this->getSectionNumber ( $section ) ) ); return TRUE; - } else { // Falls die Section nicht gefunden wurde + } else { // If Section was not found return FALSE; } } - // toString-Methode um das Template als String auszugeben + // toString-Methode to return the template as string public function __toString() { - $data = $this->getTemplate (); // aktuelles Template laden - foreach ( $this->tags as $theTag => $value ) { // Tag-Liste durchgehen + $data = $this->getTemplate (); // load current Template + foreach ( $this->tags as $theTag => $value ) { // iterate through tag list if ( $value !== null ) { - $data = str_replace ( self::OPENER . $theTag . self::CLOSER, $value, $data ); // Tags durch Werte ersetzen + $data = str_replace ( self::OPENER . $theTag . self::CLOSER, $value, $data ); // replace tags by values } } @@ -167,12 +167,12 @@ public function display() { return $this->__toString(); } - // Setzt Template-Tag mit zugehöriger Ersetzung + // Sets template tag and corresponding replacement value public function tag ( $tag, $value ) { $this->tags[$tag] = $value; } - // Destruktor + // Destructor public function __destruct(){ $this->clearSectionCache(); $this->clearTags(); From 71a8ba5d794126c6690032605ff74122375f7bd6 Mon Sep 17 00:00:00 2001 From: Thoronador Date: Sat, 19 Apr 2014 01:16:03 +0200 Subject: [PATCH 35/45] translate German comments in admin scripts --- www/admin/admin_allannouncement.php | 6 +- www/admin/admin_allemail.php | 6 +- www/admin/admin_applets_edit.php | 8 +- www/admin/admin_articles_add.php | 10 +- www/admin/admin_articles_cat.php | 150 +++++++++++----------- www/admin/admin_articles_edit.php | 2 +- www/admin/admin_captcha_config.php | 12 +- www/admin/admin_cimg.php | 12 +- www/admin/admin_cimgdel.php | 4 +- www/admin/admin_dladd.php | 18 +-- www/admin/admin_dlcat.php | 18 +-- www/admin/admin_dlconfig.php | 12 +- www/admin/admin_dledit.php | 28 ++-- www/admin/admin_dlnewcat.php | 12 +- www/admin/admin_editor_config.php | 12 +- www/admin/admin_editor_smilies.php | 14 +- www/admin/admin_find_file.php | 12 +- www/admin/admin_findpicture.php | 2 +- www/admin/admin_general_config.php | 6 +- www/admin/admin_login.php | 18 +-- www/admin/admin_news_add.php | 8 +- www/admin/admin_news_comments_list.php | 6 +- www/admin/admin_news_edit.php | 10 +- www/admin/admin_news_prev.php | 6 +- www/admin/admin_partneradd.php | 24 ++-- www/admin/admin_partnerconfig.php | 12 +- www/admin/admin_partneredit.php | 34 ++--- www/admin/admin_player_add.php | 14 +- www/admin/admin_player_config.php | 16 +-- www/admin/admin_player_edit.php | 2 +- www/admin/admin_polladd.php | 20 +-- www/admin/admin_pollconfig.php | 12 +- www/admin/admin_polledit.php | 30 ++--- www/admin/admin_press_add.php | 16 +-- www/admin/admin_press_admin.php | 20 +-- www/admin/admin_press_config.php | 12 +- www/admin/admin_press_edit.php | 46 +++---- www/admin/admin_randompic_cat.php | 14 +- www/admin/admin_randompic_config.php | 6 +- www/admin/admin_randompic_time.php | 34 ++--- www/admin/admin_randompic_time_add.php | 16 +-- www/admin/admin_screenadd.php | 14 +- www/admin/admin_screencat.php | 34 ++--- www/admin/admin_screenconfig.php | 12 +- www/admin/admin_screenedit.php | 34 ++--- www/admin/admin_screennewcat.php | 12 +- www/admin/admin_shopadd.php | 12 +- www/admin/admin_shopedit.php | 18 +-- www/admin/admin_snippets_edit.php | 6 +- www/admin/admin_statedit.php | 32 ++--- www/admin/admin_statgfx.php | 54 ++++---- www/admin/admin_statref.php | 24 ++-- www/admin/admin_statview.php | 46 +++---- www/admin/admin_template_dl.php | 8 +- www/admin/admin_user_add.php | 2 +- www/admin/admin_user_edit.php | 8 +- www/admin/admin_user_rights.php | 2 +- www/admin/admin_wallpaperadd.php | 18 +-- www/admin/admin_wallpaperedit.php | 50 ++++---- www/admin/index.php | 2 +- www/admin/templates/admin_table_admin.tpl | 2 +- 61 files changed, 555 insertions(+), 555 deletions(-) diff --git a/www/admin/admin_allannouncement.php b/www/admin/admin_allannouncement.php index d8785f5..28d204f 100644 --- a/www/admin/admin_allannouncement.php +++ b/www/admin/admin_allannouncement.php @@ -1,8 +1,8 @@ 1 ) { + /////////////////////////////////////////////////////////////// + //// Show too much selected Error & Go back to Select Form //// + /////////////////////////////////////////////////////////////// + elseif ( $_POST['applet_action'] == 'edit' && count ( $_POST['applet_id'] ) > 1 ) { // Display Error systext ( $FD->text("admin", "select_only_one_to_edit"), $FD->text("admin", "error"), TRUE, $FD->text("admin", "icon_error") ); diff --git a/www/admin/admin_articles_add.php b/www/admin/admin_articles_add.php index 5f65e2a..b7825c9 100644 --- a/www/admin/admin_articles_add.php +++ b/www/admin/admin_articles_add.php @@ -163,7 +163,7 @@ @@ -246,8 +246,8 @@ '.$FD->text("page", "edit_cat_image").': ('.$FD->text("admin", "optional").')

'; - if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) { - echo ' + if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) { + echo ' '.$cat_arr['cat_name'].' @@ -260,18 +260,18 @@
'; - } else { - echo ''.$FD->text("admin", "no_image_found").'
'; - } - echo'
+ } else { + echo ''.$FD->text("admin", "no_image_found").'
'; + } + echo '

'; - if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) { - echo ''.$FD->text("admin", "replace_img").'
'; - } - echo' + if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) { + echo ''.$FD->text("admin", "replace_img").'
'; + } + echo' ['.$FD->text("admin", "max").' '.$articles_config_arr['cat_pic_x'].' '.$FD->text("admin", "resolution_x").' '.$articles_config_arr['cat_pic_y'].' '.$FD->text("admin", "pixel").'] ['.$FD->text("admin", "max").' '.$articles_config_arr['cat_pic_size'].' '.$FD->text("admin", "kib").'] @@ -296,22 +296,22 @@ '; - } + } - // Delete Category - elseif ( $_POST['cat_action'] == 'delete' ) - { - $index = $FD->sql()->conn()->query ( 'SELECT COUNT(*) FROM '.$FD->config('pref').'articles_cat' ); + // Delete Category + elseif ( $_POST['cat_action'] == 'delete' ) + { + $index = $FD->sql()->conn()->query ( 'SELECT COUNT(*) FROM '.$FD->config('pref').'articles_cat' ); - // Not Last Category - if ( $index->fetchColumn() > 1 ) { + // Not Last Category + if ( $index->fetchColumn() > 1 ) { - $index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id = '".$_POST['cat_id']."'" ); - $cat_arr = $index->fetch(PDO::FETCH_ASSOC); + $index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref')."articles_cat WHERE cat_id = '".$_POST['cat_id']."'" ); + $cat_arr = $index->fetch(PDO::FETCH_ASSOC); - $cat_arr['cat_name'] = killhtml ( $cat_arr['cat_name'] ); + $cat_arr['cat_name'] = killhtml ( $cat_arr['cat_name'] ); - echo ' + echo '
@@ -333,13 +333,13 @@ @@ -353,13 +353,13 @@
- '; - } + '; + } - // Last Category - else { - systext ( $FD->text("page", "delete_cat_last"), $FD->text("admin", "error"), TRUE ); - echo ' + // Last Category + else { + systext ( $FD->text("page", "delete_cat_last"), $FD->text("admin", "error"), TRUE ); + echo '
@@ -367,8 +367,8 @@
'; - } - } + } + } } @@ -384,13 +384,13 @@ if (!isset($_POST['cat_name'])) $_POST['cat_name'] = ''; $_POST['cat_name'] = killhtml ( $_POST['cat_name'] ); - // Display Error Messages - if ( isset ( $_POST['sended'] ) ) { - systext ( $FD->text('admin', 'form_not_filled'), $FD->text('admin', 'error'), TRUE ); - } + // Display Error Messages + if ( isset ( $_POST['sended'] ) ) { + systext ( $FD->text('admin', 'form_not_filled'), $FD->text('admin', 'error'), TRUE ); + } // Display Add-Form - echo ' + echo '
@@ -427,26 +427,26 @@
- '; + '; - // Category Listing - echo ' + // Category Listing + echo '
- '; + '; - // Get Categories from DB - $index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref').'articles_cat ORDER BY cat_name' ); - while ( $cat_arr = $index->fetch(PDO::FETCH_ASSOC) ) - { - $index_username = $FD->sql()->conn()->query ( 'SELECT user_name FROM '.$FD->config('pref')."user WHERE user_id = '".$cat_arr['cat_user']."'" ); + // Get Categories from DB + $index = $FD->sql()->conn()->query ( 'SELECT * FROM '.$FD->config('pref').'articles_cat ORDER BY cat_name' ); + while ( $cat_arr = $index->fetch(PDO::FETCH_ASSOC) ) + { + $index_username = $FD->sql()->conn()->query ( 'SELECT user_name FROM '.$FD->config('pref')."user WHERE user_id = '".$cat_arr['cat_user']."'" ); $cat_arr['cat_user'] = $index_username->fetchColumn(); - // Display each Category - echo ' + // Display each Category + echo ' '; - } + } - // End of Form & Table incl. Submit-Button - echo ' + // End of Form & Table incl. Submit-Button + echo '
'.$FD->text('page', 'list_cat_title').'
'; - if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) { - echo ''.$cat_arr['cat_name'].''; - } - echo ' + if ( image_exists ( 'images/cat/', 'articles_'.$cat_arr['cat_id'] ) ) { + echo ''.$cat_arr['cat_name'].''; + } + echo ' '.$cat_arr['cat_name'].' ('.$FD->text("page", "list_cat_created_by").' '.$cat_arr['cat_user'].' '.$FD->text("page", "list_cat_created_on").' '.date ( $FD->config('date'), $cat_arr['cat_date'] ).')
@@ -470,10 +470,10 @@
@@ -493,6 +493,6 @@
- '; + '; } ?> diff --git a/www/admin/admin_articles_edit.php b/www/admin/admin_articles_edit.php index 1518073..1b42050 100644 --- a/www/admin/admin_articles_edit.php +++ b/www/admin/admin_articles_edit.php @@ -438,7 +438,7 @@ function action_edit_display_page ( $data_arr ) '; - // Kategorien auflisten + // List Categories $valid_ids = array(); get_dl_categories ($valid_ids, -1); @@ -442,9 +442,9 @@ '; } -//////////////////////////////// -////// Download auswählen ////// -//////////////////////////////// +///////////////////////////// +////// Select Download ////// +///////////////////////////// else { @@ -508,7 +508,7 @@ '; - // Daten aus der DB lesen + // Read data from DB $wherecat = ''; if (isset($_POST['dlcatid']) && $_POST['dlcatid'] != 0) { diff --git a/www/admin/admin_dlnewcat.php b/www/admin/admin_dlnewcat.php index fd7603f..665b339 100644 --- a/www/admin/admin_dlnewcat.php +++ b/www/admin/admin_dlnewcat.php @@ -1,8 +1,8 @@ 0 && isset($_POST['smilies_cols']) && $_POST['smilies_cols']>0 AND isset($_POST['textarea_width']) && $_POST['textarea_width']>0 && isset($_POST['textarea_height']) && $_POST['textarea_height']>0) @@ -99,9 +99,9 @@ systext($FD->text('page', 'changes_saved'), $FD->text('page', 'info')); } -///////////////////////////////////// -////// Konfiguration Formular /////// -///////////////////////////////////// +///////////////////////////////// +////// Konfiguration Form /////// +///////////////////////////////// else { diff --git a/www/admin/admin_editor_smilies.php b/www/admin/admin_editor_smilies.php index 0572a74..742f13f 100644 --- a/www/admin/admin_editor_smilies.php +++ b/www/admin/admin_editor_smilies.php @@ -50,9 +50,9 @@ systext('Ausgewählte Smilies wurden gelöscht!'); } -//////////////////////////// -//// Smilie Positionen //// -//////////////////////////// +/////////////////////////// +//// Smilie Positions //// +/////////////////////////// elseif (isset($_GET['action']) AND ($_GET['action']=='moveup' OR $_GET['action']=='movedown') AND isset($_GET['oid'])) { @@ -72,9 +72,9 @@ } } -//////////////////////////// -////// smilie list ////// -//////////////////////////// +///////////////////////// +////// smilie list ////// +///////////////////////// $index = $FD->sql()->conn()->query('SELECT * FROM '.$FD->config('pref').'editor_config'); $config_arr = $index->fetch(PDO::FETCH_ASSOC); @@ -163,7 +163,7 @@ '; - // Smilies auslesen + // Read Smilies from DB $index = $FD->sql()->conn()->query('SELECT COUNT(*) FROM '.$FD->config('pref').'smilies'); $smilie_last = $index->fetchColumn(); $index = $FD->sql()->conn()->query('SELECT * FROM '.$FD->config('pref').'smilies ORDER BY `order` ASC'); diff --git a/www/admin/admin_find_file.php b/www/admin/admin_find_file.php index 97fe99e..5cf280e 100644 --- a/www/admin/admin_find_file.php +++ b/www/admin/admin_find_file.php @@ -20,22 +20,22 @@ function ftp_is_dir($conn, $dir) { $ftp = $FD->sql()->conn()->query('SELECT * FROM '.$FD->config('pref').'ftp WHERE `ftp_id` = 1 LIMIT 1'); $ftp = $ftp->fetch(PDO::FETCH_ASSOC); - // Verbindung aufbauen + // establish connection if($ftp['ftp_ssl']) { $_SESSION['ftp_conn'] = @ftp_ssl_connect($ftp['ftp_url']); } else { $_SESSION['ftp_conn'] = @ftp_connect($ftp['ftp_url']); } - // Login mit Benutzername und Passwort + // Login with user name and password $login_result = @ftp_login($_SESSION['ftp_conn'], $ftp['ftp_user'], $ftp['ftp_pw']); - // Verbindung überprüfen + // check connection if ((!$_SESSION['ftp_conn']) || (!$login_result)) { // display error $adminpage->clearConds(); $adminpage->clearTexts(); - $adminpage->addText('connection_error_text', sprintf($FD->text("page", "connection_error_text"), htmlenclose($ftp['ftp_url'], 'strong'), htmlenclose($ftp['ftp_user'], 'strong'))); + $adminpage->addText('connection_error_text', sprintf($FD->text('page', 'connection_error_text'), htmlenclose($ftp['ftp_url'], 'strong'), htmlenclose($ftp['ftp_user'], 'strong'))); $content = $adminpage->get('conn_error'); } else { @@ -95,7 +95,7 @@ function ftp_is_dir($conn, $dir) { // display page $adminpage->clearConds(); $adminpage->clearTexts(); - $adminpage->addText('connection_ok', sprintf($FD->text("page", "connection_ok"), htmlenclose($ftp['ftp_url'], 'strong'), htmlenclose($ftp['ftp_user'], 'strong'))); + $adminpage->addText('connection_ok', sprintf($FD->text('page', 'connection_ok'), htmlenclose($ftp['ftp_url'], 'strong'), htmlenclose($ftp['ftp_user'], 'strong'))); $adminpage->addText('url_links', $furllinks); $adminpage->addText('up_url', '?go=find_file&id='.$_GET['id'].'&f='.$_GET['f'].'..'); $adminpage->addText('lines', implode($folder_list).implode($file_list)); @@ -103,7 +103,7 @@ function ftp_is_dir($conn, $dir) { $content = $adminpage->get('main'); } - // Verbindung schließen + // close connection @ftp_close($_SESSION['ftp_conn']); } catch (Exception $e) { diff --git a/www/admin/admin_findpicture.php b/www/admin/admin_findpicture.php index b00ee57..166f4b8 100644 --- a/www/admin/admin_findpicture.php +++ b/www/admin/admin_findpicture.php @@ -87,7 +87,7 @@ $main = ' - + '.$lines.'

Bild auswählen

Bild auswählen

'; } diff --git a/www/admin/admin_general_config.php b/www/admin/admin_general_config.php index cf12d41..e46ba23 100644 --- a/www/admin/admin_general_config.php +++ b/www/admin/admin_general_config.php @@ -67,9 +67,9 @@ unset($_POST); } -///////////////////////////////////// -////// Konfiguration Formular /////// -///////////////////////////////////// +///////////////////////////////// +////// Konfiguration Form /////// +///////////////////////////////// if ( TRUE ) { diff --git a/www/admin/admin_login.php b/www/admin/admin_login.php index e9c8a8b..336f3d4 100644 --- a/www/admin/admin_login.php +++ b/www/admin/admin_login.php @@ -1,8 +1,8 @@ text("admin", "icon_login") ); } -//////////////////////////// -/////// Loginabfrage /////// -//////////////////////////// +////////////////////////// +/////// Login form /////// +////////////////////////// else { diff --git a/www/admin/admin_news_add.php b/www/admin/admin_news_add.php index 8571c72..5c81da1 100644 --- a/www/admin/admin_news_add.php +++ b/www/admin/admin_news_add.php @@ -159,14 +159,14 @@ if(isset($_POST['link']) && !empty($_POST['link_action'])) { - // löschen + // delete if ($_POST['link_action'] == 'del') { unset($_POST['link_name'][$_POST['link']], $_POST['link_url'][$_POST['link']], $_POST['link_target'][$_POST['link']]); } //up elseif ($_POST['link_action'] == 'up' && $_POST['link'] != 0) { - // werte tauschen + // exchange values list($_POST['link_name'][$_POST['link']-1], $_POST['link_name'][$_POST['link']]) = array($_POST['link_name'][$_POST['link']], $_POST['link_name'][$_POST['link']-1]); list($_POST['link_url'][$_POST['link']-1], $_POST['link_url'][$_POST['link']]) @@ -177,7 +177,7 @@ //down elseif ($_POST['link_action'] == 'down' && $_POST['link'] < count($_POST['link_name'])-1) { - // werte tauschen + // exchange values list($_POST['link_name'][$_POST['link']+1], $_POST['link_name'][$_POST['link']]) = array($_POST['link_name'][$_POST['link']], $_POST['link_name'][$_POST['link']+1]); list($_POST['link_url'][$_POST['link']+1], $_POST['link_url'][$_POST['link']]) @@ -186,7 +186,7 @@ = array($_POST['link_target'][$_POST['link']], $_POST['link_target'][$_POST['link']+1]); } - //bearbeiten + //edit elseif ($_POST['link_action'] == 'edit') { $_POST['new_link_name'] = $_POST['link_name'][$_POST['link']]; $_POST['new_link_url'] = $_POST['link_url'][$_POST['link']]; diff --git a/www/admin/admin_news_comments_list.php b/www/admin/admin_news_comments_list.php index a15367c..b8b8b54 100644 --- a/www/admin/admin_news_comments_list.php +++ b/www/admin/admin_news_comments_list.php @@ -427,7 +427,7 @@ echo ' '; } }//for - }//else (Tokens vorhanden) + }//else (Tokens present) echo '
@@ -503,7 +503,7 @@ $order .= ' DESC'; } - //Kommentare auslesen + //Read comments from DB $query = $FD->sql()->conn()->query('SELECT COUNT(comment_id) FROM `'.$FD->config('pref').'comments`, `'.$FD->config('pref').'news` WHERE `'.$FD->config('pref').'comments`.content_id=`'.$FD->config('pref').'news`.news_id @@ -520,7 +520,7 @@ AND content_type=\'news\' ORDER BY '.$order.' LIMIT '.$_GET['start'].', 30'); - //Bereich (zahlenmäßig) + //Range (numbers) $bereich = ''.($_GET['start']+1).' ... '.($_GET['start'] + $rows).''; //Is this not the first page? if ($_GET['start']>0) diff --git a/www/admin/admin_news_edit.php b/www/admin/admin_news_edit.php index cf9c6fa..39b5651 100644 --- a/www/admin/admin_news_edit.php +++ b/www/admin/admin_news_edit.php @@ -628,14 +628,14 @@ function action_comments_delete ( $DATA ) if(isset($_POST['link']) && !empty($_POST['link_action'])) { - // löschen + // delete if ($_POST['link_action'] == 'del') { unset($_POST['link_name'][$_POST['link']], $_POST['link_url'][$_POST['link']], $_POST['link_target'][$_POST['link']]); } //up elseif ($_POST['link_action'] == "up" && $_POST['link'] != 0) { - // Werte tauschen + // exchange values list($_POST['link_name'][$_POST['link']-1], $_POST['link_name'][$_POST['link']]) = array($_POST['link_name'][$_POST['link']], $_POST['link_name'][$_POST['link']-1]); list($_POST['link_url'][$_POST['link']-1], $_POST['link_url'][$_POST['link']]) @@ -646,7 +646,7 @@ function action_comments_delete ( $DATA ) //down elseif ($_POST['link_action'] == 'down' && $_POST['link'] < count($_POST['link_name'])-1) { - // Werte tauschen + // exchange values list($_POST['link_name'][$_POST['link']+1], $_POST['link_name'][$_POST['link']]) = array($_POST['link_name'][$_POST['link']], $_POST['link_name'][$_POST['link']+1]); list($_POST['link_url'][$_POST['link']+1], $_POST['link_url'][$_POST['link']]) @@ -655,7 +655,7 @@ function action_comments_delete ( $DATA ) = array($_POST['link_target'][$_POST['link']], $_POST['link_target'][$_POST['link']+1]); } - //bearbeiten + //edit elseif ($_POST['link_action'] == 'edit') { $_POST['new_link_name'] = $_POST['link_name'][$_POST['link']]; $_POST['new_link_url'] = $_POST['link_url'][$_POST['link']]; @@ -869,7 +869,7 @@ function action_comments_delete ( $DATA ) // Page list try { - // serached? + // searched? $searched = (!empty($_REQUEST['filter_string']) && $_REQUEST['search_type'] === 0); // search diff --git a/www/admin/admin_news_prev.php b/www/admin/admin_news_prev.php index 35be4ae..523e47c 100644 --- a/www/admin/admin_news_prev.php +++ b/www/admin/admin_news_prev.php @@ -105,7 +105,7 @@ function loaddata() { settype($_POST['news_user'], 'integer'); $news_arr['user_url'] = '../?go=user&id='.$_POST['news_user']; - // Text formatieren + // Format Text $html = ($config_arr['html_code'] == 2 || $config_arr['html_code'] == 4) ? TRUE : FALSE; $fs = ($config_arr['fs_code'] == 2 || $config_arr['fs_code'] == 4) ? TRUE : FALSE; $para = ($config_arr['para_handling'] == 2 || $config_arr['para_handling'] == 4) ? TRUE : FALSE; @@ -113,7 +113,7 @@ function loaddata() { $news_arr['news_text'] = fscode ( $_POST['news_text'], $fs, $html, $para ); $news_arr['news_title'] = killhtml ( $_POST['news_title'] ); - // Kategorie lesen + // Read category from DB settype($_POST['news_cat_id'], 'integer'); $index = $FD->sql()->conn()->query('SELECT `cat_name`, `cat_id` FROM `'.$FD->config('pref')."news_cat` WHERE `cat_id` = '".$_POST['news_cat_id']."'"); $cat_arr = $index->fetch(PDO::FETCH_ASSOC); @@ -197,7 +197,7 @@ function loaddata() { // Get Main Template echo get_maintemplate ($template_general, '../'); - $JUST_CONTENT = true; //preview has own html head + $JUST_CONTENT = true; //preview has own HTML head } ?> diff --git a/www/admin/admin_partneradd.php b/www/admin/admin_partneradd.php index ea0cb15..4206003 100644 --- a/www/admin/admin_partneradd.php +++ b/www/admin/admin_partneradd.php @@ -1,8 +1,8 @@ loadConfig('affiliates'); $config_arr = $FD->configObject('affiliates')->getConfigArray(); @@ -22,9 +22,9 @@ } -/////////////////////////////// -//// Partnerbild hochladen //// -/////////////////////////////// +////////////////////////////// +//// Upload Partner image //// +////////////////////////////// if (isset($_FILES['bild_small']['name']) && $_FILES['bild_small']['name'] != '' && isset($_FILES['bild_big']['name']) && $_FILES['bild_big']['name'] != '' && (isset($_POST['name']) AND $_POST['name'] != '') @@ -88,9 +88,9 @@ } -////////////////////////// -//// Error Message //// -////////////////////////// +/////////////////////// +//// Error Message //// +/////////////////////// elseif (isset($_POST['sended'])) { echo get_systext($FD->text('admin', 'changes_not_saved').'
'.$FD->text('admin', 'form_not_filled'), $FD->text('admin', 'error'), 'red', $FD->text('admin', 'icon_save_error')); @@ -104,9 +104,9 @@ if (!isset($_POST['description'])) $_POST['description'] = ''; if (!isset($_POST['permanent'])) $_POST['permanent'] = ''; -////////////////////////// -//// Partner Formular //// -////////////////////////// +////////////////////// +//// Partner Form //// +////////////////////// echo'
diff --git a/www/admin/admin_partnerconfig.php b/www/admin/admin_partnerconfig.php index cc8fab4..4880d23 100644 --- a/www/admin/admin_partnerconfig.php +++ b/www/admin/admin_partnerconfig.php @@ -6,9 +6,9 @@ $used_cols = array('partner_anzahl', 'small_x', 'small_y', 'small_allow', 'big_x', 'big_y', 'big_allow', 'file_size'); -////////////////////////////// -/// Partnerseite editieren /// -////////////////////////////// +/////////////////////////// +/// Edit affiliate site /// +/////////////////////////// if (isset($_POST['small_x']) && isset($_POST['small_y']) && isset($_POST['big_x']) && isset($_POST['big_y']) && isset($_POST['file_size']) && (isset($_POST['partner_anzahl']) && $_POST['partner_anzahl']>0)) { @@ -31,9 +31,9 @@ unset($_POST); } -////////////////////////////// -/// Partnerseite anzeigen //// -////////////////////////////// +/////////////////////////////// +/// Display affiliate site //// +/////////////////////////////// if ( TRUE ) { diff --git a/www/admin/admin_partneredit.php b/www/admin/admin_partneredit.php index 3e829c6..6ca1d73 100644 --- a/www/admin/admin_partneredit.php +++ b/www/admin/admin_partneredit.php @@ -1,8 +1,8 @@ loadConfig('affiliates'); $config_arr = $FD->configObject('affiliates')->getConfigArray(); @@ -22,9 +22,9 @@ } -////////////////////////////// -/// Partnerseite editieren /// -////////////////////////////// +//////////////////////////// +/// Edit affiliated site /// +//////////////////////////// if ((isset($_POST['name']) AND $_POST['name'] != '') && (isset($_POST['link']) AND $_POST['link'] != '') && $_POST['partner_action'] == 'edit' @@ -68,9 +68,9 @@ } -////////////////////////////// -/// Partnerseite löschen ///// -////////////////////////////// +//////////////////////////////// +/// Delete affiliated site ///// +//////////////////////////////// elseif (isset($_POST['partner_action']) && $_POST['partner_action'] == 'delete' && isset($_POST['sended']) @@ -80,7 +80,7 @@ { settype($_POST['partner_id'], 'integer'); - if ($_POST['delete_partner']) // Partnerseite löschen + if ($_POST['delete_partner']) // Delete affiliated site { $FD->sql()->conn()->exec('DELETE FROM '.$FD->config('pref')."partner WHERE partner_id = '$_POST[partner_id]'"); image_delete('images/partner/', $_POST['partner_id'].'_small'); @@ -99,9 +99,9 @@ } -////////////////////////////// -/// Partnerseite anzeigen //// -////////////////////////////// +///////////////////////////// +/// Show affiliated site //// +///////////////////////////// elseif (isset($_POST['partner_action']) && $_POST['partner_action'] == 'edit' && isset($_POST['partner_id']) @@ -218,9 +218,9 @@ '; } -////////////////////////////// -/// Partnerseite löschen ///// -////////////////////////////// +//////////////////////////////// +/// Delete affiliated site ///// +//////////////////////////////// elseif (isset($_POST['partner_action']) && $_POST['partner_action'] == 'delete' && isset($_POST['partner_id']) @@ -277,7 +277,7 @@ ////////////////////////////// -/// Partnerseite auswählen /// +/// Select affiliated site /// ////////////////////////////// if (!isset($_POST['partner_id'])) { diff --git a/www/admin/admin_player_add.php b/www/admin/admin_player_add.php index b76f374..3b427b9 100644 --- a/www/admin/admin_player_add.php +++ b/www/admin/admin_player_add.php @@ -2,9 +2,9 @@ echo noscript_nohidden (); -////////////////////////// -//// Video einstellen //// -////////////////////////// +/////////////////// +//// Add Video //// +/////////////////// if ( isset($_POST['video_title']) && $_POST['video_title'] != '' && @@ -59,9 +59,9 @@ unset ( $_POST ); } -////////////////////////// -///// Video Formular ///// -////////////////////////// +////////////////////// +///// Video Form ///// +////////////////////// if ( TRUE ) { @@ -211,7 +211,7 @@ diff --git a/www/admin/admin_player_edit.php b/www/admin/admin_player_edit.php index 2b6c8dd..f86437b 100644 --- a/www/admin/admin_player_edit.php +++ b/www/admin/admin_player_edit.php @@ -284,7 +284,7 @@ - +

Kategorien auswählen

Kategorien auswählen

Name diff --git a/www/admin/admin_randompic_config.php b/www/admin/admin_randompic_config.php index e8fd502..c267934 100644 --- a/www/admin/admin_randompic_config.php +++ b/www/admin/admin_randompic_config.php @@ -5,9 +5,9 @@ ################### $used_cols = array('active', 'type_priority', 'use_priority_only', 'timed_deltime'); -///////////////////////////////////// -//// Konfiguration aktualisieren //// -///////////////////////////////////// +////////////////////////////// +//// Configuration Update //// +////////////////////////////// if (isset($_POST['sended']) AND (($_POST['timed_deltime']==1 AND $_POST['deltime_time']) OR $_POST['timed_deltime']!=1) ) { diff --git a/www/admin/admin_randompic_time.php b/www/admin/admin_randompic_time.php index b5a6965..69811cc 100644 --- a/www/admin/admin_randompic_time.php +++ b/www/admin/admin_randompic_time.php @@ -1,7 +1,7 @@ sql()->conn()->exec('DELETE FROM '.$FD->config('pref')."screen_random WHERE random_id = '$_POST[random_id]'"); systext($FD->text('page', 'note_deleted')); @@ -67,9 +67,9 @@ -////////////////////////////// -/// Randompic editieren ////// -////////////////////////////// +///////////////////////// +/// Edit Randompic ////// +///////////////////////// elseif (isset($_POST['random_action']) && $_POST['random_action'] == 'edit' && isset($_POST['random_id']) ) @@ -92,7 +92,7 @@ $random_arr['end_h'] = date('H', $random_arr['end']); $random_arr['end_min'] = date('i', $random_arr['end']); - //Zeit-Array für Jetzt Button + //Time Array for "Now" Button $jetzt['time'] = time(); $jetzt['tag'] = date('d', $jetzt['time']); $jetzt['monat'] = date('m', $jetzt['time']); @@ -196,9 +196,9 @@ -////////////////////////////// -/// Randompic löschen //////// -////////////////////////////// +///////////////////////////// +/// Delete Randompic //////// +///////////////////////////// elseif (isset($_POST['random_action']) && $_POST['random_action'] == 'delete' && isset($_POST['random_id']) ) @@ -261,9 +261,9 @@ -////////////////////////////// -/// Randompic Auswahl //////// -////////////////////////////// +///////////////////////////// +//// Randompic Selection //// +///////////////////////////// if (!isset($_POST['random_id'])) { echo'

diff --git a/www/admin/admin_randompic_time_add.php b/www/admin/admin_randompic_time_add.php index df9b777..0515d27 100644 --- a/www/admin/admin_randompic_time_add.php +++ b/www/admin/admin_randompic_time_add.php @@ -1,7 +1,7 @@ - + + Bitte legen Sie zuerst eine neue Kategorie für diesen Typ an. @@ -215,9 +215,9 @@ } } } -/////////////////////////// -/// Kategorie auswählen /// -/////////////////////////// +/////////////////////// +/// Delete Category /// +/////////////////////// else { diff --git a/www/admin/admin_screenconfig.php b/www/admin/admin_screenconfig.php index ed786fd..1b4ae9d 100644 --- a/www/admin/admin_screenconfig.php +++ b/www/admin/admin_screenconfig.php @@ -5,9 +5,9 @@ ################### $used_cols = array('screen_x', 'screen_y', 'screen_thumb_x', 'screen_thumb_y', 'screen_size', 'screen_rows', 'screen_cols', 'screen_order', 'screen_sort', 'show_type', 'show_size_x', 'show_size_y', 'show_img_x', 'show_img_y', 'wp_x', 'wp_y', 'wp_thumb_x', 'wp_thumb_y', 'wp_size', 'wp_rows', 'wp_cols', 'wp_order', 'wp_sort'); -///////////////////////////////////// -//// Konfiguration aktualisieren //// -///////////////////////////////////// +////////////////////////////// +//// Configuration Update //// +////////////////////////////// if (TRUE && isset ($_POST['show_type']) @@ -52,9 +52,9 @@ unset($_POST); } -///////////////////////////////////// -////// Konfiguration Formular /////// -///////////////////////////////////// +///////////////////////////////// +////// Configuration Form /////// +///////////////////////////////// if (true) { diff --git a/www/admin/admin_screenedit.php b/www/admin/admin_screenedit.php index 52abf3b..57a0f02 100644 --- a/www/admin/admin_screenedit.php +++ b/www/admin/admin_screenedit.php @@ -4,22 +4,22 @@ $FD->loadConfig('screens'); $config_arr = $FD->configObject('screens')->getConfigArray(); -////////////////////////////// -//// Screenshot editieren //// -////////////////////////////// +///////////////////////// +//// Edit Screenshot //// +///////////////////////// if (isset($_POST['title']) AND $_POST['do'] == 'edit') { settype($_POST['catid'], 'integer'); settype($_POST['editscreenid'], 'integer'); - if ($_POST['delscreen']) // Screenshot löschen + if ($_POST['delscreen']) // Delete Screenshot { $FD->sql()->conn()->exec('DELETE FROM '.$FD->config('pref')."screen WHERE screen_id = $_POST[editscreenid]"); image_delete('images/screenshots/', $_POST['editscreenid']); image_delete('images/screenshots/', "$_POST[editscreenid]_s"); systext('Screenshot wurde gelöscht'); } - else // Screenshot editieren + else // Edit Screenshot { $stmt = $FD->sql()->conn()->prepare( 'UPDATE '.$FD->config('pref')."screen @@ -32,16 +32,16 @@ } -////////////////////////////// -//// Screenshot anzeigen ///// -////////////////////////////// +///////////////////////////// +//// Display Screenshot ///// +///////////////////////////// elseif (isset($_POST['screenid'])) { -///////////////////////////// -//// Thumb neu erstellen //// -///////////////////////////// +///////////////////////// +//// Re-create Thumb //// +///////////////////////// //security functions @@ -138,7 +138,7 @@ } ///////////////////////////// -/// Screenshot Kategorien /// +/// Screenshot Categories /// ///////////////////////////// else @@ -155,7 +155,7 @@

Zeitgesteuertes Vorschaubild hinzufügen

Zeitgesteuertes Vorschaubild hinzufügen

Bild:
diff --git a/www/admin/admin_screenadd.php b/www/admin/admin_screenadd.php index 3be2398..cc3c663 100644 --- a/www/admin/admin_screenadd.php +++ b/www/admin/admin_screenadd.php @@ -1,13 +1,13 @@ loadConfig('screens'); $config_arr = $FD->configObject('screens')->getConfigArray(); -///////////////////////////// -//// Screenshot hochladen /// -///////////////////////////// +/////////////////////////// +//// Screenshot Upload //// +/////////////////////////// if (isset($_POST['sended'])) { @@ -54,9 +54,9 @@ } } -///////////////////////////// -//// Screenshot Formular //// -///////////////////////////// +///////////////////////// +//// Screenshot Form //// +///////////////////////// echo' diff --git a/www/admin/admin_screencat.php b/www/admin/admin_screencat.php index 5234128..107e8ba 100644 --- a/www/admin/admin_screencat.php +++ b/www/admin/admin_screencat.php @@ -1,8 +1,8 @@ text('admin', 'changes_saved'), $FD->text('admin', 'info'), 'green', $FD->text('admin', 'icon_save_ok')); } -/////////////////////////// -//// Kategorie löschen //// -/////////////////////////// +///////////////////////// +//// Delete Category //// +///////////////////////// elseif (isset($_POST['cat_id']) && isset($_POST['sended']) && $_POST['sended'] == 'delete') { //security functions @@ -40,15 +40,15 @@ } ////////////////////////// -/// Kategorie Funktion /// +/// Category Functions /// ////////////////////////// elseif (isset($_POST['cat_id']) AND isset($_POST['cat_action'])) { -//////////////////////////// -/// Kategorie bearbeiten /// -//////////////////////////// +///////////////////// +/// Edit Category /// +///////////////////// //security functions @@ -144,9 +144,9 @@ '; } -///////////////////////// -/// Kategorie löschen /// -///////////////////////// +/////////////////////// +/// Delete Category /// +/////////////////////// elseif ($_POST['cat_action'] == 'delete') @@ -205,7 +205,7 @@
Die letzte Kategorie diesen Typs kann nicht gelöscht werden.
- Bitte legen Sie zuerst eine neue Kategorie für diesen Typ an.
- +

Kategorie auswählen

Kategorie auswählen

Dateien der Kategorie @@ -180,9 +180,9 @@ '; -////////////////////////////// -//// Screenshot auswählen //// -////////////////////////////// +/////////////////////////// +//// Select Screenshot //// +/////////////////////////// if (isset($_POST['screencatid'])) { @@ -190,7 +190,7 @@
- +

Bild auswählen

Bild auswählen

Bild diff --git a/www/admin/admin_screennewcat.php b/www/admin/admin_screennewcat.php index 9cbfe11..71acf9c 100644 --- a/www/admin/admin_screennewcat.php +++ b/www/admin/admin_screennewcat.php @@ -1,8 +1,8 @@ text('admin', 'cat_added'), $FD->text('admin', 'info'), 'green', $FD->text('admin', 'icon_save_add')); } -////////////////////////////// -///// Kategorie Formular ///// -////////////////////////////// +///////////////////////// +///// Category Form ///// +///////////////////////// else { diff --git a/www/admin/admin_shopadd.php b/www/admin/admin_shopadd.php index 80172e8..e73b9a6 100644 --- a/www/admin/admin_shopadd.php +++ b/www/admin/admin_shopadd.php @@ -1,8 +1,8 @@ 1 ) { // Display Error systext ( $FD->text("admin", "select_only_one_to_edit"), diff --git a/www/admin/admin_statedit.php b/www/admin/admin_statedit.php index 0ed90a2..0c404be 100644 --- a/www/admin/admin_statedit.php +++ b/www/admin/admin_statedit.php @@ -1,8 +1,8 @@ text('page', 'changes_saved'), $FD->text('page', 'info') ); } -////////////////////////////////////// -////// Tagesstatistik editieren ////// -////////////////////////////////////// +/////////////////////////////////// +////// Edit daily statistics ////// +/////////////////////////////////// elseif ((isset($_POST['ed']) && isset($_POST['em']) && isset($_POST['ey'])) AND $_POST['do'] == 'day') { @@ -89,9 +89,9 @@ } } -////////////////////////////////////// -/// Gesamtstatistik aktualisieren //// -////////////////////////////////////// +/////////////////////////////////// +/// Update of total statistics //// +/////////////////////////////////// elseif ((isset($_POST['editvisits']) && $_POST['editvisits'] != '' && isset($_POST['edithits']) && $_POST['edithits'] != '' && @@ -118,9 +118,9 @@ systext( $FD->text('page', 'changes_saved'), $FD->text('page', 'info') ); } -//////////////////////////////////////// -/// Gesamtstatistik synchronisieren //// -//////////////////////////////////////// +///////////////////////////////////// +/// Synchronise Total Statistics //// +///////////////////////////////////// elseif (isset($_POST['do']) && $_POST['do'] == 'sync') { @@ -149,13 +149,13 @@ comments = '$sync_arr[comments]'"); systext( $FD->text('page', 'synchronised'), $FD->text('page', 'info') ); } -////////////////////////////////////// -///// Gesamtstatistik editieren ////// -////////////////////////////////////// +////////////////////////////////// +///// Edit Total Statistics ////// +////////////////////////////////// else { - //Zeit-Array für Heute Button + //Time Array for "Today" Button $heute['d'] = date('d'); $heute['m'] = date('m'); $heute['y'] = date('Y'); diff --git a/www/admin/admin_statgfx.php b/www/admin/admin_statgfx.php index a9973f0..0026c53 100644 --- a/www/admin/admin_statgfx.php +++ b/www/admin/admin_statgfx.php @@ -18,12 +18,12 @@ $monthnames = explode(',', $FD->text('frontend', 'month_names_array')); $monthname = $monthnames[$_GET['s_month']-1]; -$feldbreite = 458 / date_loc('t',mktime(0, 0, 0, $_GET['s_month'], 1, $_GET['s_year'])); // Anzahle der Tage im Monat +$feldbreite = 458 / date_loc('t',mktime(0, 0, 0, $_GET['s_month'], 1, $_GET['s_year'])); // Numbers of days per month $imagewidth = 500; $imageheight = 300; -// Farben +// Colours $image = imagecreate($imagewidth,$imageheight); $farbe_body = imagecolorallocate($image,21,21,21); $farbe_visits = imagecolorallocate($image,85,85,85); @@ -34,7 +34,7 @@ $farbe_text2 = imagecolorallocate($image,25,25,25); $farbe_text3 = imagecolorallocate($image,204,204,204); -// Oberfläche +// Area imagestring ($image,3,140,11, $FD->text('page', 'monthly_statistics')." ($monthname $_GET[s_year])",$farbe_text); imagefilledrectangle($image,20,35,45,40,$farbe_visits); imagestring ($image,2,57,30,'Visits',$farbe_text); @@ -42,7 +42,7 @@ imagestring ($image,2,418,30,'Hits',$farbe_text); imagefilledrectangle($image,20,45,480,285,$farbe_rot); -// Hitskurve +// Hits curve $index = $FD->sql()->conn()->query( 'SELECT s_hits FROM '.$FD->env('pref')."counter_stat @@ -68,42 +68,42 @@ if ($row !== false) { $dbhits = $row['s_hits']; - // X-Koordinate + // X-coordinate $hitsarray[$arraycount] = $startwert; $startwert = $startwert + $feldbreite; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $hitsarray[$arraycount] = 285 - ($dbhits / $dbmaxhits * 220); $arraycount = $arraycount+1; } else { - // X-Koordinate + // X-coordinate $hitsarray[$arraycount] = $startwert; $startwert = $startwert + $feldbreite; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $hitsarray[$arraycount] = 285; $arraycount = $arraycount+1; } } -// X-Koordinate +// X-coordinate $hitsarray[$arraycount] = 479; $arraycount = $arraycount+1; -// Y-Koordinate +// Y-coordinate $hitsarray[$arraycount] = $hitsarray[$arraycount-2]; $arraycount = $arraycount+1; -// X-Koordinate +// X-coordinate $hitsarray[$arraycount] = 480; $arraycount = $arraycount+1; -// Y-Koordinate +// Y-coordinate $hitsarray[$arraycount] = 285; $arraycount = $arraycount+1; -// X-Koordinate +// X-coordinate $hitsarray[$arraycount] = 20; $arraycount = $arraycount+1; -// Y-Koordinate +// Y-coordinate $hitsarray[$arraycount] = 285; $arraycount = $arraycount+1; @@ -112,7 +112,7 @@ imagefilledpolygon($image, $hitsarray, round($arraycount/2) , $farbe_hits); -// Visitskurve +// Visits curve $index = $FD->sql()->conn()->query( 'SELECT s_visits FROM '.$FD->config('pref')."counter_stat @@ -137,42 +137,42 @@ if ($row !== false) { $dbvisits = $row['s_visits']; - // X-Koordinate + // X-coordinate $visitsarray[$arraycount] = $startwert; $startwert = $startwert + $feldbreite; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $visitsarray[$arraycount] = 285 - ($dbvisits / $dbmaxvisits * 160); $arraycount = $arraycount+1; } else { - // X-Koordinate + // X-coordinate $visitsarray[$arraycount] = $startwert; $startwert = $startwert + $feldbreite; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $visitsarray[$arraycount] = 285; $arraycount = $arraycount+1; } } - // X-Koordinate + // X-coordinate $visitsarray[$arraycount] = 479; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $visitsarray[$arraycount] = $visitsarray[$arraycount-2]; $arraycount = $arraycount+1; - // X-Koordinate + // X-coordinate $visitsarray[$arraycount] = 480; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $visitsarray[$arraycount] = 285; $arraycount = $arraycount+1; - // X-Koordinate + // X-coordinate $visitsarray[$arraycount] = 20; $arraycount = $arraycount+1; - // Y-Koordinate + // Y-coordinate $visitsarray[$arraycount] = 285; $arraycount = $arraycount+1; @@ -183,7 +183,7 @@ $dbmaxvisits = 1; } -// Tage +// Days $startwert = 24; for ($d=1; $d<$anz_tage+1; $d++) { @@ -201,7 +201,7 @@ imageline($image,$startwert,45,$startwert,285,$farbe_rot); } -// Scala +// Scale imagerectangle($image,20,45,480,285,$farbe_rand); switch (TRUE) diff --git a/www/admin/admin_statref.php b/www/admin/admin_statref.php index d7367bb..2b95b88 100644 --- a/www/admin/admin_statref.php +++ b/www/admin/admin_statref.php @@ -5,9 +5,9 @@ ################### $cronjobs_cols = array('ref_cron', 'ref_days', 'ref_hits', 'ref_contact', 'ref_age', 'ref_amount'); -////////////////////////// -//// Referrer Löschen //// -////////////////////////// +//////////////////////// +//// Delete Referer //// +//////////////////////// if ( has_perm('stat_ref_delete') @@ -65,9 +65,9 @@ } } -////////////////////////// -/// Filter definieren //// -////////////////////////// +////////////////////// +/// Define Filter //// +////////////////////// else { @@ -157,9 +157,9 @@ '; -////////////////////////// -/// Referrer anzeigen //// -////////////////////////// +///////////////////// +/// Show Referer //// +///////////////////// echo' @@ -277,9 +277,9 @@
'; -//////////////////////// -/// Referrer löschen /// -//////////////////////// +////////////////////// +/// Delete Referer /// +////////////////////// if (has_perm('stat_ref_delete')) { // Get Config data diff --git a/www/admin/admin_statview.php b/www/admin/admin_statview.php index e95fffe..b5a7a88 100644 --- a/www/admin/admin_statview.php +++ b/www/admin/admin_statview.php @@ -15,9 +15,9 @@ array_unshift($day_arr, array_pop($day_arr)); $month_arr = explode(',', $FD->text('frontend', 'month_names_array')); -////////////////////////////////// -//// Jahresauswahl generieren //// -////////////////////////////////// +///////////////////////////////// +//// Generate year selection //// +///////////////////////////////// echo' @@ -26,11 +26,11 @@ '; -// Höchste PI diesen Monat ermitteln +// Find highest PI count for month $index = $FD->sql()->conn()->query( 'SELECT s_hits FROM '.$FD->config('pref')."counter_stat @@ -97,7 +97,7 @@ if (false == ($dbmaxhits = $index->fetchColumn())) $dbmaxhits = 0; -// Tage ausgeben +// Display Days $dcount = 0; $visitsall = 0; $hitsall = 0; @@ -113,7 +113,7 @@ $dayname = date('w', mktime(0, 0, 0, $_GET['s_month'], $d, $_GET['s_year'])); $class = (($dayname == 0) || ($dayname == 6)) ? 'class="nw"' : 'class="n"'; - // Tag vorhanden + // Day exists in DB if ($row !== false) { $dcount = $dcount+1; @@ -213,11 +213,11 @@ '; -////////////////////////////////// -/// Jahresstatistik generieren /// -////////////////////////////////// +///////////////////////////////////////// +/// Generate statistics for full year /// +///////////////////////////////////////// -// Maximale Montaszahl ermitteln +// Find maximum monthly hits for year $index = $FD->sql()->conn()->query( 'SELECT SUM(s_hits) AS sumhits FROM '.$FD->config('pref')."counter_stat @@ -308,22 +308,22 @@

'; -////////////////////////////////// -// sonstige Statistik generieren / -////////////////////////////////// +/////////////////////////////// +// Generate other statistics // +/////////////////////////////// -// Counter lesen +// Read Counter $index = $FD->sql()->conn()->query( 'SELECT * FROM '.$FD->config('pref').'counter' ); $counterdaten = $index->fetch(PDO::FETCH_ASSOC); -// User online +// Users online $online = get_online_ips(); -// Best frequentierter Tag +// Day of most hits $index = $FD->sql()->conn()->query('SELECT * FROM '.$FD->config('pref').'counter_stat ORDER BY s_hits DESC LIMIT 1'); $mosthits = $index->fetch(PDO::FETCH_ASSOC); -// Best besuchter Tag +// Day of most visits $index = $FD->sql()->conn()->query('SELECT * FROM '.$FD->config('pref').'counter_stat ORDER BY s_visits DESC LIMIT 1'); $mostvisits = $index->fetch(PDO::FETCH_ASSOC); diff --git a/www/admin/admin_template_dl.php b/www/admin/admin_template_dl.php index b9f5dd7..f89ea4e 100644 --- a/www/admin/admin_template_dl.php +++ b/www/admin/admin_template_dl.php @@ -29,7 +29,7 @@ $tmp['help'][1]['text'] = $FD->text("template", "dl_search_field_help_2"); $tmp['help'][2]['tag'] = 'all_url'; $tmp['help'][2]['text'] = $FD->text("template", "dl_search_field_help_3"); - $TEMPLATE_EDIT[] = $tmp; //$tmp is no saved in the template-creation-array + $TEMPLATE_EDIT[] = $tmp; //$tmp is now saved in the template-creation-array unset($tmp); //unsets $tmp for safety-issues $TEMPLATE_EDIT[] = array ( @@ -132,7 +132,7 @@ $tmp['help'][5]['text'] = $FD->text("template", "dl_file_help_6"); $tmp['help'][6]['tag'] = 'mirror_col'; $tmp['help'][6]['text'] = $FD->text("template", "dl_file_help_7"); - $TEMPLATE_EDIT[] = $tmp; //$tmp is no saved in the template-creation-array + $TEMPLATE_EDIT[] = $tmp; //$tmp is now saved in the template-creation-array unset($tmp); //unsets $tmp for safety-issues $tmp['name'] = 'ENTRY_FILE_IS_MIRROR'; @@ -140,7 +140,7 @@ $tmp['description'] = $FD->text("template", "dl_file_is_mirror_description"); $tmp['rows'] = '10'; $tmp['cols'] = '66'; - $TEMPLATE_EDIT[] = $tmp; //$tmp is no saved in the template-creation-array + $TEMPLATE_EDIT[] = $tmp; //$tmp is now saved in the template-creation-array unset($tmp); //unsets $tmp for safety-issues $tmp['name'] = 'ENTRY_STATISTICS'; @@ -156,7 +156,7 @@ $tmp['help'][2]['text'] = $FD->text("template", "dl_stats_help_3"); $tmp['help'][3]['tag'] = 'hits'; $tmp['help'][3]['text'] = $FD->text("template", "dl_stats_help_4"); - $TEMPLATE_EDIT[] = $tmp; //$tmp is no saved in the template-creation-array + $TEMPLATE_EDIT[] = $tmp; //$tmp is now saved in the template-creation-array unset($tmp); //unsets $tmp for safety-issues diff --git a/www/admin/admin_user_add.php b/www/admin/admin_user_add.php index 1c8cbaf..b2e1de7 100644 --- a/www/admin/admin_user_add.php +++ b/www/admin/admin_user_add.php @@ -194,7 +194,7 @@ function user_name_free ( $USERNAME ) { settype ( $_POST['user_group'], 'integer' ); settype ( $_POST['user_show_mail'], 'integer' ); - // get oterh data + // get other data $date_arr = getsavedate ( $_POST['d'], $_POST['m'], $_POST['y'], 0, 0, 0, TRUE ); $nowbutton_array = array( 'd', 'm', 'y' ); diff --git a/www/admin/admin_user_edit.php b/www/admin/admin_user_edit.php index b9e34fb..2e2334d 100644 --- a/www/admin/admin_user_edit.php +++ b/www/admin/admin_user_edit.php @@ -665,9 +665,9 @@ function user_name_free_or_itself ( $USERNAME, $USER_ID ) { -//////////////////////////// -////// User auswählen ////// -//////////////////////////// +///////////////////////// +////// Select User ////// +///////////////////////// if ( !isset ( $_POST['user_id'] ) ) { @@ -714,7 +714,7 @@ function user_name_free_or_itself ( $USERNAME, $USER_ID ) {

'; - // get users from db + // get users from DB $sql_filter = '%'.$_POST['filter'].'%'; $stmt = $FD->sql()->conn()->prepare ( ' SELECT COUNT(`user_id`) diff --git a/www/admin/admin_user_rights.php b/www/admin/admin_user_rights.php index 80c368f..c264349 100644 --- a/www/admin/admin_user_rights.php +++ b/www/admin/admin_user_rights.php @@ -104,7 +104,7 @@ function get_group_rights_array ( $GROUP_ID, $IS_USER = FALSE ) systext ( $FD->text('admin', 'changes_saved'), $FD->text('admin', 'info') ); } else { - systext ( 'Dieser User kann nicht bearbeitet werden', $FD->text('admin', 'error'), TRUE ); + systext ( 'Dieser User kann nicht bearbeitet werden.', $FD->text('admin', 'error'), TRUE ); } // Unset Vars diff --git a/www/admin/admin_wallpaperadd.php b/www/admin/admin_wallpaperadd.php index a9f4667..875ec55 100644 --- a/www/admin/admin_wallpaperadd.php +++ b/www/admin/admin_wallpaperadd.php @@ -1,14 +1,14 @@ loadConfig('screens'); $config_arr = $FD->configObject('screens')->getConfigArray(); -///////////////////////////// -//// Screenshot hochladen /// -///////////////////////////// +////////////////////////// +//// Screenshot Upload /// +////////////////////////// if (isset($_FILES['sizeimg_0']) AND isset($_POST['size']['0']) AND !emptystr($_POST['wallpaper_name']) AND isset($_POST['wpadd']) AND $_POST['wpadd'] == 1) { @@ -80,9 +80,9 @@ } -//////////////////////////// -//// Wallpaper Formular //// -//////////////////////////// +//////////////////////// +//// Wallpaper Form //// +//////////////////////// if (!isset($_POST['options'])) { diff --git a/www/admin/admin_wallpaperedit.php b/www/admin/admin_wallpaperedit.php index 04aba7f..b0ba78f 100644 --- a/www/admin/admin_wallpaperedit.php +++ b/www/admin/admin_wallpaperedit.php @@ -1,15 +1,15 @@ loadConfig('screens'); $config_arr = $FD->configObject('screens')->getConfigArray(); -//////////////////////////// -//// Wallpaper editieren /// -//////////////////////////// +/////////////////////// +//// Edit Wallpaper /// +/////////////////////// if (isset($_POST['wallpaper_id']) AND isset($_POST['sended']) AND $_POST['sended'] == 'edit' AND !emptystr($_POST['wallpaper_name']) AND isset($_POST['size'][0]) AND isset($_POST['wpedit']) AND $_POST['wpedit'] == 1) { $index = $FD->sql()->conn()->prepare('SELECT COUNT(*) FROM '.$FD->config('pref').'wallpaper WHERE wallpaper_name = ?'); @@ -30,7 +30,7 @@ WHERE wallpaper_id = $_POST[wallpaper_id]"); $update->execute(array($_POST['wallpaper_name'], $_POST['wallpaper_title'])); - // Files aktualisieren + // Update Files for ($i=0; $itext('admin', 'changes_saved'), $FD->text('admin', 'info'), 'green', $FD->text('admin', 'icon_save_ok')); - //IF Ende + //IF End } else { @@ -100,7 +100,7 @@ } } ////////////////////////// -//// Wallpaper löschen /// +//// Delete Wallpaper //// ////////////////////////// elseif (isset($_POST['wallpaper_id']) AND isset($_POST['sended']) AND $_POST['sended'] == 'delete') { @@ -122,24 +122,24 @@ systext('Wallpaper wurden gelöscht'); } -////////////////////////// -/// Wallpaper Funktion /// -////////////////////////// +/////////////////////////// +/// Wallpaper Functions /// +/////////////////////////// elseif (isset($_POST['wallpaper_id']) AND isset($_POST['wp_action'])) { //security function $_POST['wallpaper_id'] = intval($_POST['wallpaper_id']); -//////////////////////////// -/// Wallpaper bearbeiten /// -//////////////////////////// +////////////////////// +/// Edit Wallpaper /// +////////////////////// if ($_POST['wp_action'] == 'edit') { - //Thumb neu erstellen + //Re-create Thumb if (isset($_POST['sended']) && $_POST['sended'] == 'newthumb') { $index = $FD->sql()->conn()->query('SELECT wallpaper_name FROM '.$FD->config('pref')."wallpaper WHERE wallpaper_id = '$_POST[wallpaper_id]'"); @@ -177,7 +177,7 @@ systext($error_message); } - //EDIT ANFANG + //EDIT BEGIN $index2 = $FD->sql()->conn()->query('SELECT COUNT(*) FROM '.$FD->config('pref')."wallpaper_sizes WHERE wallpaper_id = '$_POST[wallpaper_id]'"); $index2_num_rows = (int) $index2->fetchColumn(); @@ -373,9 +373,9 @@ '; } -///////////////////////// -/// Wallpaper löschen /// -///////////////////////// +//////////////////////// +/// Delete Wallpaper /// +//////////////////////// elseif ($_POST['wp_action'] == 'delete') @@ -389,7 +389,7 @@
'; -// Erstes Jahr ermitteln +// Determine first year $index = $FD->sql()->conn()->query('SELECT s_year FROM '.$FD->config('pref').'counter_stat ORDER BY s_year LIMIT 1'); $dbfirstyear = $index->fetchColumn(); -// Ersten Monat ermitteln +// find first month $index = $FD->sql()->conn()->query('SELECT s_month FROM '.$FD->config('pref')."counter_stat WHERE s_year = $dbfirstyear ORDER BY s_month LIMIT 1"); $dbfirstmonth = $index->fetchColumn(); @@ -41,7 +41,7 @@ echo ''; -// Alle weiteren Jahre auflisten +// List all other (later) years if ($dbfirstyear < date('Y')) { for ($y=$dbfirstyear+1; $y<=date('Y'); $y++) @@ -54,9 +54,9 @@ } } -////////////////////////////////// -/// Monatsstatistik generieren /// -////////////////////////////////// +/////////////////////////////////// +/// Generate monthly statistics /// +/////////////////////////////////// $monthname = date('n', mktime(0, 0, 0, $_GET['s_month']+1, 0, 0)); echo' @@ -86,7 +86,7 @@
Benutzer auswählen
- + From b0d47f875f3557d2c9f9fb5fde8acf2d58482eb8 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Fri, 25 Apr 2014 21:22:50 +0200 Subject: [PATCH 36/45] poll-system: fixed wrong expression in if construct --- www/applets/poll-system.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/applets/poll-system.php b/www/applets/poll-system.php index 54357f8..d311c29 100644 --- a/www/applets/poll-system.php +++ b/www/applets/poll-system.php @@ -60,9 +60,9 @@ ////////////////////////// //// View Result //// ////////////////////////// -if (isset($_POST['poll_id']) && +if ( ( - ($_POST['poll_id'] === $poll_arr['poll_id'] || $poll_arr['random'] === true) + isset($_POST['poll_id']) && ($_POST['poll_id'] === $poll_arr['poll_id'] || $poll_arr['random'] === true) || checkVotedPoll($poll_arr['poll_id']) || (isset($poll_arr['poll_end']) && time() > $poll_arr['poll_end']) ) From 653669b626c30b4ee50fdf69430ccb828e7beb45 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Sat, 26 Apr 2014 15:55:06 +0200 Subject: [PATCH 37/45] fixed content image import checks if the directory media/content/ is writeable. --- www/admin/admin_cimgimport.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/admin/admin_cimgimport.php b/www/admin/admin_cimgimport.php index 1449622..73ce7e6 100644 --- a/www/admin/admin_cimgimport.php +++ b/www/admin/admin_cimgimport.php @@ -9,8 +9,10 @@ if(isset($_POST['sended']) && isset($_POST['cat_action']) && $_POST['cat_action'] == "import"){ if (!isset($_POST['thumb'])) $_POST['thumb'] = array(); - - if(count($_POST['image']) > 0){ + + if(count($_POST['image']) > 0 && !is_writable ( CIMG_PATH )){ + systext('Keine Schreibrechte auf das Verzeichnis '.CIMG_PATH.'.'); + }elseif(count($_POST['image']) > 0){ $count = 0; $stmt = $FD->sql()->conn()->prepare('INSERT INTO `'.$FD->config('pref').'cimg` (`name`, `type`, `hasthumb`, `cat`) VALUES (?, ?, ?, ?)'); foreach($_POST['image'] as $image){ From da317386d767eeda14bae781730ceaf5a90b4f52 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Mon, 28 Apr 2014 12:18:03 +0200 Subject: [PATCH 38/45] Fixed Password Length in Admin menu --- www/admin/admin_login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/admin/admin_login.php b/www/admin/admin_login.php index e9c8a8b..4ab5601 100644 --- a/www/admin/admin_login.php +++ b/www/admin/admin_login.php @@ -58,7 +58,7 @@ Passwort: From 3b725ebf926288970ca907d21ba4e985ef56ded0 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Mon, 28 Apr 2014 14:29:32 +0200 Subject: [PATCH 39/45] fix applet loading --- www/includes/indexfunctions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/www/includes/indexfunctions.php b/www/includes/indexfunctions.php index 3f6702a..c70311a 100644 --- a/www/includes/indexfunctions.php +++ b/www/includes/indexfunctions.php @@ -628,6 +628,7 @@ function load_applets() ////////////////////// function load_an_applet($file, $output, $args) { + global $FD; // Setup $SCRIPT Var unset($SCRIPT, $template); $SCRIPT['argc'] = array_unshift($args, $file); From b99def0c48b5c968b4b4fd7d019b3c324ad8f847 Mon Sep 17 00:00:00 2001 From: Sweil Date: Tue, 20 May 2014 21:50:25 +0200 Subject: [PATCH 40/45] added stub for search_rules Signed-off-by: Sweil --- db.sql | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/db.sql b/db.sql index 80b283f..b37d8b6 100644 --- a/db.sql +++ b/db.sql @@ -1,13 +1,13 @@ -- phpMyAdmin SQL Dump --- version 3.5.1 +-- version 4.0.4 -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 14. Jul 2013 um 10:10 --- Server Version: 5.1.53-community-log --- PHP-Version: 5.4.3 +-- Erstellungszeit: 20. Mai 2014 um 19:49 +-- Server Version: 5.6.12-log +-- PHP-Version: 5.4.12 -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; SET time_zone = "+00:00"; @@ -19,6 +19,8 @@ SET time_zone = "+00:00"; -- -- Datenbank: `fs2` -- +CREATE DATABASE IF NOT EXISTS `fs2` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; +USE `fs2`; -- -------------------------------------------------------- @@ -337,7 +339,7 @@ CREATE TABLE IF NOT EXISTS `fs2_articles` ( PRIMARY KEY (`article_id`), KEY `article_url` (`article_url`), FULLTEXT KEY `article_text` (`article_title`,`article_text`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ; -- -- Daten für Tabelle `fs2_articles` @@ -348,7 +350,9 @@ INSERT INTO `fs2_articles` (`article_id`, `article_url`, `article_title`, `artic (2, '', 'ie 8 test', 1302480000, 1, 'ie 8 test', 1, 1, 1, 1, 1302560322), (3, 'sds', 'fsdfsdf', 1302739200, 1, 'sdf', 1, 1, 1, 1, 1302797133), (4, 'sd', 'hallo', 1302739200, 1, 'sdfsdf', 1, 1, 1, 1, 1302797137), -(5, 'sss', 'sdfdfdf', 1372888800, 1, 'sdfsdfdf', 1, 1, 1, 1, 1372971785); +(5, 'sss', 'sdfdfdf', 1372888800, 1, 'sdfsdfdf', 1, 1, 1, 1, 1372971785), +(6, 'test', 'Test', 1394319600, 1, '

\r\nInnerhalb des Koprulu-Sektors gibt es viele Planeten und planetenähnliche Objekte, auf denen sich die Weltraumreisenden niedergelassen haben. Eine kurze Übersicht über die wichtigsten Planeten und deren Geschichte soll hier gegeben werden.\r\n\r\n

Wallpaper löschen

Wallpaper löschen

Wallpaper löschen:

@@ -426,9 +426,9 @@ } } -/////////////////////////// -/// Kategorie auswählen /// -/////////////////////////// +/////////////////////// +/// Select Category /// +/////////////////////// else { @@ -470,9 +470,9 @@ '; -/////////////////////////// -/// Wallpaper auswählen /// -/////////////////////////// +//////////////////////// +/// Select Wallpaper /// +//////////////////////// if (isset($_POST['wpcatid'])) { diff --git a/www/admin/index.php b/www/admin/index.php index 726b308..27d4dbc 100644 --- a/www/admin/index.php +++ b/www/admin/index.php @@ -212,7 +212,7 @@
- '.get_topmenu($PAGE_DATA_ARR['menu']); //creates the menu-list + '.get_topmenu($PAGE_DATA_ARR['menu']); //creates the menu list echo '
diff --git a/www/admin/templates/admin_table_admin.tpl b/www/admin/templates/admin_table_admin.tpl index b512cff..48fd6ac 100644 --- a/www/admin/templates/admin_table_admin.tpl +++ b/www/admin/templates/admin_table_admin.tpl @@ -43,7 +43,7 @@
- +
\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n
Aiur
\r\nDieser Planet war die Geburtstätte der Protoss und ihr größter Stolz, bis der Overmind mit dem Schwarm dort einfiel und die Protoss nach Shakuras fliehen mussten. Mittlerweile ist Aiur eine riesige Brutstätte der Zerg.
Braxis
\r\nZwar soll Braxis aufgrund seiner eisigen Temperaturen einer der lebensfeindlichsten Planeten des gesamten Sektors sein, doch lange Zeit schon wird der Planet sowohl von Terranern als auch von den Protoss besiedelt.
Char
\r\nDiese vulkanische Welt ist der Hauptschwarmcluster des Schwarms im Sektor. Milliarden von Zerg warten hier darauf, gegen die Welten der Protoss und der Terraner entsandt zu werden, um Tod und Zerstörung zu bringen.
Kaldir
\r\nDurch seine isolierte Position innerhalb des Sektors und die lebensfeindlichen Temperaturen haben sich hier enorm widerstandsfähige Organismen entwickelt. Es wird gemunkelt, dass die Protoss sich hier niedergelassen haben, um Forschungen an besagten Wesen durchzuführen.
Korhal
\r\nDie terranische Liga hat ihren Hauptsitz auf Korhal und regiert von dort aus alle Vasallenplaneten innerhalb des Sektors. Der ganze Planet ist überzogen mit Siedlungen und gilt als Wiege der terranischen Zivilisation des Koprulu-Sektors.
Mar Sara
\r\nMar Saras Geschichte ist blutig, denn nach der Zerginvasion, welche Millionen das Leben kosteten, verwüsteten die Protoss im Sinne der ihrer Eindämmung der Zergbedrohung die Oberfläche erneut. Durch ein Terraformingprojekt der Liga wurde der Planet mittlerweile wieder bewohnbar und ist nun wieder schwach besiedelt.
Moria
\r\nAuf diesem Planeten wird ein Großteil der für den Bau der terranischen Kriegsmaschinerie benötigten Erze und Mineralien abgebaut. Durch den hohen Umsatz an weltvollen Stoffen gilt diese Welt als ein Krisenherd, der durch den Konflikt zwischen der Liga und dem Kel-Morianischen Kartell genährt wird.
Neu-Folsom
\r\nDieser instabile Planet wurde von der Liga als ein tödliches Gefängnis für all Jene konzipiert, die den ideologischen Grundsätzen der Liga wiedersprechen. Auch politische Feinde des Imperators sind hier eingesperrt. Es heißt, niemand könne diesem Ort entkommen, wenn er erst einmal eingesperrt sei.
Phaeton
\r\nDie Wüstenweld Phaetons bietet weitläufige Sanddünen und Geröllansammlungen. Durch die hohen Klippen und tiefen Tunneln gilt diese Welt oft auch als Versteck für Exilanten. Doch auch die Zerg haben die Abgelegenheit des Planeten für sich entdeckt.
Shiloh
\r\nDieser florierende Planet bietet gemäßigtes Klima und liefert vielen Planeten der Terraner Nahrungsmittel in riesigen Mengen. Davon abgesehen gilt dieser Planet außerdem als Geburtsort der Rebellion, ist er doch die Heimatwelt des Rebellen Jim Raynor.
Tarsonis
\r\nZur Zeit der Konföderation galt dieser Planet als Wiege der Menschheit des gesamten Sektors. Durch den von Arcturus Mengsk eingeleiteten Einfall der Zerg wurde der Planet und damit auch die Konföderation selbst vernichtet und musste der neu gegründeten Liga der Menschen weichen.
Umoja
\r\nJener Planet bietet Mengsks Imperium bereits seit dessen Gründung Widerstand und ist Sitz des umojanischen Protektorats. Diese Organisation ist ideologisch den Grundsätzen der Liga entgegengerichtet und arbeitet daran, die Liga zu stürzen.
', 1, 0, 1, 1, 1394403463), +(7, 'search_help', 'Suchregeln', 1400536800, 1, 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]mäuse[/font] => Findet Inhalte mit "Mäuse", "mäuse" oder "Maeuse"\r\n\r\n\r\n[b]Phonetische Suche[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]team[/font] => Findet Inhalte mit "Team", "Tim", "Teen", etc,\r\n\r\n\r\n[b]Suche nach Teilwörtern: *[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n\r\n[b]Mehrere Suchbegriffe: AND [/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo [i]Beispiele:[/i]\r\n[font=monospace]frosch internet[/font] => Findet Inhalte mit "frosch" UND "internet"\r\n[font=monospace]hund AND katze[/font] => Findet Inhalte mit "hund" UND "katze"\r\n\r\n\r\n[b]Suchbegriffe auschließen: ![/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]maus katze !hund[/font] => Findet Inhalte mit "maus" UND "katze", aber OHNE "hund"\r\n\r\n\r\n[b]ODER-Vereinigung: OR[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]papagei OR rabe[/font] => Findet Inhalte mit "papagei" ODER "rabe"\r\n\r\n\r\n[b]Entweder-oder-Suche: XOR[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]frau XOR mann[/font] => Findet Inhalte mit "frau" aber NICHT "mann" und umgekehrt\r\n\r\n\r\n[b]Mehrere Operatoren mit Klammern[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]kind AND (hund XOR katze)[/font] => Findet Inhalte mit "kind" die entweder "hund" oder "katze" enthalten', 1, 1, 1, 1, 1400614560); -- -------------------------------------------------------- @@ -455,7 +459,7 @@ CREATE TABLE IF NOT EXISTS `fs2_comments` ( `needs_update` tinyint(4) NOT NULL DEFAULT '1', PRIMARY KEY (`comment_id`), FULLTEXT KEY `comment_title_text` (`comment_text`,`comment_title`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ; -- -- Daten für Tabelle `fs2_comments` @@ -463,7 +467,8 @@ CREATE TABLE IF NOT EXISTS `fs2_comments` ( INSERT INTO `fs2_comments` (`comment_id`, `content_id`, `content_type`, `comment_poster`, `comment_poster_id`, `comment_poster_ip`, `comment_date`, `comment_title`, `comment_text`, `comment_classification`, `spam_probability`, `needs_update`) VALUES (3, 5, 'news', '1', 1, '127.0.0.1', 1306441173, 'hans', 'hans', 0, 0.5, 0), -(6, 11, 'dl', '1', 1, '::1', 1373196687, 'test', 'test', 0, 0.5, 0); +(6, 11, 'dl', '1', 1, '::1', 1373196687, 'test', 'test', 0, 0.5, 0), +(7, 45, 'news', 'spam', 0, '::1', 1394920254, 'spam', 'ssdsd', 0, 0.5, 1); -- -------------------------------------------------------- @@ -488,9 +493,9 @@ INSERT INTO `fs2_config` (`config_name`, `config_data`, `config_loadhook`) VALUE ('system', '{"var_loop":20}', 'startup'), ('env', '{}', 'startup'), ('info', '{}', 'startup'), -('articles', '{"acp_per_page":"2","html_code":"2","fs_code":"4","para_handling":"4","cat_pic_x":"150","cat_pic_y":"150","cat_pic_size":"1024","com_rights":"0","com_antispam":"0","com_sort":"0","acp_view":"2"}', 'none'), +('articles', '{"acp_per_page":"20","html_code":"2","fs_code":"4","para_handling":"4","cat_pic_x":"150","cat_pic_y":"150","cat_pic_size":"1024","com_rights":"0","com_antispam":"0","com_sort":"0","acp_view":"2"}', 'none'), ('search', '{"id":"0","search_num_previews":"10","search_and":"AND, and, &&","search_or":"OR, or, ||","search_xor":"XOR, xor","search_not":"!, -","search_wildcard":"*, %","search_min_word_length":"3","search_allow_phonetic":"1","search_use_stopwords":"1"}', 'none'), -('cronjobs', '{"last_cronjob_time":"1373796388","last_cronjob_time_daily":"1373794392","last_cronjob_time_hourly":"1373796000","search_index_update":"1","ref_cron":"1","ref_days":"5","ref_hits":"5","ref_contact":"first","ref_age":"older","ref_amount":"less"}', 'startup'), +('cronjobs', '{"last_cronjob_time":"1400614351","last_cronjob_time_daily":"1400614351","last_cronjob_time_hourly":"1400614351","search_index_update":"1","ref_cron":"1","ref_days":"5","ref_hits":"5","ref_contact":"first","ref_age":"older","ref_amount":"less"}', 'startup'), ('captcha', '{"captcha_bg_color":"FAFCF1","captcha_bg_transparent":"0","captcha_text_color":"AB30AB","captcha_first_lower":"1","captcha_first_upper":"5","captcha_second_lower":"1","captcha_second_upper":"5","captcha_use_addition":"1","captcha_use_subtraction":"1","captcha_use_multiplication":"0","captcha_create_easy_arithmetics":"1","captcha_x":"58","captcha_y":"18","captcha_show_questionmark":"0","captcha_use_spaces":"1","captcha_show_multiplication_as_x":"1","captcha_start_text_x":"0","captcha_start_text_y":"0","captcha_font_size":"5","captcha_font_file":""}', 'none'), ('downloads', '{"screen_x":"1024","screen_y":"768","thumb_x":"120","thumb_y":"90","quickinsert":"test''","dl_rights":"2","dl_show_sub_cats":"0","dl_comments":"1"}', 'none'), ('affiliates', '{"partner_anzahl":"5","small_x":"88","small_y":"31","big_x":"468","big_y":"60","big_allow":"1","file_size":"1024","small_allow":"0"}', 'none'), @@ -526,7 +531,7 @@ CREATE TABLE IF NOT EXISTS `fs2_counter` ( -- INSERT INTO `fs2_counter` (`id`, `visits`, `hits`, `user`, `artikel`, `news`, `comments`) VALUES -(1, 100, 3256, 5, 5, 18, 2); +(1, 108, 3333, 5, 7, 18, 3); -- -------------------------------------------------------- @@ -549,7 +554,7 @@ CREATE TABLE IF NOT EXISTS `fs2_counter_ref` ( INSERT INTO `fs2_counter_ref` (`ref_url`, `ref_count`, `ref_first`, `ref_last`) VALUES ('http://localhost/', 55, 1302557491, 1307980522), -('http://localhost/fs2/', 20, 1316955935, 1368367379); +('http://localhost/fs2/', 27, 1316955935, 1400614351); -- -------------------------------------------------------- @@ -653,7 +658,15 @@ INSERT INTO `fs2_counter_stat` (`s_year`, `s_month`, `s_day`, `s_visits`, `s_hit (2013, 7, 7, 1, 42), (2013, 7, 8, 1, 39), (2013, 7, 9, 1, 1), -(2013, 7, 14, 1, 31); +(2013, 7, 14, 1, 31), +(2014, 1, 12, 1, 3), +(2014, 3, 9, 1, 6), +(2014, 3, 15, 1, 14), +(2014, 3, 16, 1, 26), +(2014, 4, 6, 1, 5), +(2014, 4, 12, 1, 12), +(2014, 4, 13, 1, 3), +(2014, 5, 20, 1, 8); -- -------------------------------------------------------- @@ -879,14 +892,7 @@ CREATE TABLE IF NOT EXISTS `fs2_hashes` ( `deleteTime` int(11) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `hash` (`hash`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ; - --- --- Daten für Tabelle `fs2_hashes` --- - -INSERT INTO `fs2_hashes` (`id`, `hash`, `type`, `typeId`, `deleteTime`) VALUES -(6, 'lV59nTmddoAqe6cbRgn5kLdZ6zegxKvUWiraRMeM', 'newpassword', 3, 1373969314); +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -1932,7 +1938,7 @@ CREATE TABLE IF NOT EXISTS `fs2_useronline` ( -- INSERT INTO `fs2_useronline` (`ip`, `user_id`, `date`) VALUES -('::1', 1, 1373226787); +('::1', 1, 1400614604); -- -------------------------------------------------------- From 7a04553dcf336dd9fde6b539b827221242873275 Mon Sep 17 00:00:00 2001 From: Sweil Date: Sat, 24 May 2014 13:42:03 +0200 Subject: [PATCH 41/45] search rules notice fixes Signed-off-by: Sweil --- db.sql | 13 +++++++------ www/admin/admin_articles_edit.php | 3 +++ www/applets/poll-system.php | 6 ++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/db.sql b/db.sql index b37d8b6..b42f831 100644 --- a/db.sql +++ b/db.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 20. Mai 2014 um 19:49 +-- Erstellungszeit: 24. Mai 2014 um 11:41 -- Server Version: 5.6.12-log -- PHP-Version: 5.4.12 @@ -352,7 +352,7 @@ INSERT INTO `fs2_articles` (`article_id`, `article_url`, `article_title`, `artic (4, 'sd', 'hallo', 1302739200, 1, 'sdfsdf', 1, 1, 1, 1, 1302797137), (5, 'sss', 'sdfdfdf', 1372888800, 1, 'sdfsdfdf', 1, 1, 1, 1, 1372971785), (6, 'test', 'Test', 1394319600, 1, '

\r\nInnerhalb des Koprulu-Sektors gibt es viele Planeten und planetenähnliche Objekte, auf denen sich die Weltraumreisenden niedergelassen haben. Eine kurze Übersicht über die wichtigsten Planeten und deren Geschichte soll hier gegeben werden.\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n
Aiur
\r\nDieser Planet war die Geburtstätte der Protoss und ihr größter Stolz, bis der Overmind mit dem Schwarm dort einfiel und die Protoss nach Shakuras fliehen mussten. Mittlerweile ist Aiur eine riesige Brutstätte der Zerg.
Braxis
\r\nZwar soll Braxis aufgrund seiner eisigen Temperaturen einer der lebensfeindlichsten Planeten des gesamten Sektors sein, doch lange Zeit schon wird der Planet sowohl von Terranern als auch von den Protoss besiedelt.
Char
\r\nDiese vulkanische Welt ist der Hauptschwarmcluster des Schwarms im Sektor. Milliarden von Zerg warten hier darauf, gegen die Welten der Protoss und der Terraner entsandt zu werden, um Tod und Zerstörung zu bringen.
Kaldir
\r\nDurch seine isolierte Position innerhalb des Sektors und die lebensfeindlichen Temperaturen haben sich hier enorm widerstandsfähige Organismen entwickelt. Es wird gemunkelt, dass die Protoss sich hier niedergelassen haben, um Forschungen an besagten Wesen durchzuführen.
Korhal
\r\nDie terranische Liga hat ihren Hauptsitz auf Korhal und regiert von dort aus alle Vasallenplaneten innerhalb des Sektors. Der ganze Planet ist überzogen mit Siedlungen und gilt als Wiege der terranischen Zivilisation des Koprulu-Sektors.
Mar Sara
\r\nMar Saras Geschichte ist blutig, denn nach der Zerginvasion, welche Millionen das Leben kosteten, verwüsteten die Protoss im Sinne der ihrer Eindämmung der Zergbedrohung die Oberfläche erneut. Durch ein Terraformingprojekt der Liga wurde der Planet mittlerweile wieder bewohnbar und ist nun wieder schwach besiedelt.
Moria
\r\nAuf diesem Planeten wird ein Großteil der für den Bau der terranischen Kriegsmaschinerie benötigten Erze und Mineralien abgebaut. Durch den hohen Umsatz an weltvollen Stoffen gilt diese Welt als ein Krisenherd, der durch den Konflikt zwischen der Liga und dem Kel-Morianischen Kartell genährt wird.
Neu-Folsom
\r\nDieser instabile Planet wurde von der Liga als ein tödliches Gefängnis für all Jene konzipiert, die den ideologischen Grundsätzen der Liga wiedersprechen. Auch politische Feinde des Imperators sind hier eingesperrt. Es heißt, niemand könne diesem Ort entkommen, wenn er erst einmal eingesperrt sei.
Phaeton
\r\nDie Wüstenweld Phaetons bietet weitläufige Sanddünen und Geröllansammlungen. Durch die hohen Klippen und tiefen Tunneln gilt diese Welt oft auch als Versteck für Exilanten. Doch auch die Zerg haben die Abgelegenheit des Planeten für sich entdeckt.
Shiloh
\r\nDieser florierende Planet bietet gemäßigtes Klima und liefert vielen Planeten der Terraner Nahrungsmittel in riesigen Mengen. Davon abgesehen gilt dieser Planet außerdem als Geburtsort der Rebellion, ist er doch die Heimatwelt des Rebellen Jim Raynor.
Tarsonis
\r\nZur Zeit der Konföderation galt dieser Planet als Wiege der Menschheit des gesamten Sektors. Durch den von Arcturus Mengsk eingeleiteten Einfall der Zerg wurde der Planet und damit auch die Konföderation selbst vernichtet und musste der neu gegründeten Liga der Menschen weichen.
Umoja
\r\nJener Planet bietet Mengsks Imperium bereits seit dessen Gründung Widerstand und ist Sitz des umojanischen Protektorats. Diese Organisation ist ideologisch den Grundsätzen der Liga entgegengerichtet und arbeitet daran, die Liga zu stürzen.
', 1, 0, 1, 1, 1394403463), -(7, 'search_help', 'Suchregeln', 1400536800, 1, 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]mäuse[/font] => Findet Inhalte mit "Mäuse", "mäuse" oder "Maeuse"\r\n\r\n\r\n[b]Phonetische Suche[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]team[/font] => Findet Inhalte mit "Team", "Tim", "Teen", etc,\r\n\r\n\r\n[b]Suche nach Teilwörtern: *[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n\r\n[b]Mehrere Suchbegriffe: AND [/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo [i]Beispiele:[/i]\r\n[font=monospace]frosch internet[/font] => Findet Inhalte mit "frosch" UND "internet"\r\n[font=monospace]hund AND katze[/font] => Findet Inhalte mit "hund" UND "katze"\r\n\r\n\r\n[b]Suchbegriffe auschließen: ![/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]maus katze !hund[/font] => Findet Inhalte mit "maus" UND "katze", aber OHNE "hund"\r\n\r\n\r\n[b]ODER-Vereinigung: OR[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]papagei OR rabe[/font] => Findet Inhalte mit "papagei" ODER "rabe"\r\n\r\n\r\n[b]Entweder-oder-Suche: XOR[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]frau XOR mann[/font] => Findet Inhalte mit "frau" aber NICHT "mann" und umgekehrt\r\n\r\n\r\n[b]Mehrere Operatoren mit Klammern[/b]\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumyeirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diamvoluptua. At vero eos et accusam et justo duo dolores.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]kind AND (hund XOR katze)[/font] => Findet Inhalte mit "kind" die entweder "hund" oder "katze" enthalten', 1, 1, 1, 1, 1400614560); +(7, 'search_help', 'Suchregeln', 1400536800, 1, 'Mit der Suchfunktion können die verschiedenen Inhalte dieser Webseite schnell und einfach gefunden werden. Suchbegriffe können beliebig angeben werden, es sollten aber die folgenden Regeln bedacht werden:\r\n[list]\r\n[*][b]Ein Suchbegriff muss aus mindestens 3 Zeichen bestehen[/b]\r\n[*][b]Nach bestimmten, häufig vorkommenden Füllwörtern kann nicht gesucht werden:[/b] \r\nz.B. "und", "oder", "hallo", etc.\r\n[*][b]Zahlen & Sonderzeichen werden durch Leerzeichen ersetzt[/b]\r\n[*][b]Umlaute werden umgewandelt:[/b] ä => ae, ö=>oe, ü => ue\r\n[/list]\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]Ei[/font] => Findet nichts, da der Suchbegriff zu kurz ist\r\n[font=monospace]und oder oder[/font] => Findet nichts, da nur nach Füllwörtern gesucht wurde\r\n[font=monospace]Guten8geschichte[/font] => Sucht nach "guten" und "geschichte"\r\n[font=monospace]mäuse[/font] => Findet Inhalte mit "Mäuse", "mäuse" oder "Maeuse"\r\n\r\nDamit die Suchergebnisse immer nachvollziehbar bleiben, wird bei jeder Suche auch die berechnete Suchanfrage mit ausgegeben. So kann die eigene Anfrage leicht überprüft und evtl. korrigiert werden.\r\n\r\n\r\n[b][size=3]Suchfunktionen[/size][/b]\r\n\r\nLiefert die Suche nach einfachen Stichwörtern nicht das gewünschte Ergebnis, kann die Suchanfrage verfeinert werden. Dazu stehen einige Operatoren und Funktionen zur Verfügung.\r\n\r\n\r\n[b]Alle Suchbegriffe müssen enthalten sein: AND[/b]\r\nDie Verknüpfung mit AND ist der Standardoperator. Sie wird auch immer dann angewandt, wenn keine andere Verknüpfung angegeben wurde. Mit der AND-Verknüpfung werden nur Inhalte gefunden, die alle Suchbegriffe enthalten.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]frosch internet[/font] => Findet nur Inhalte mit "frosch" UND "internet"\r\n[font=monospace]hund AND katze[/font] => Findet nur Inhalte mit "hund" UND "katze"\r\n\r\n\r\n[b]Nur ein Suchbegriffe muss enthalten sein: OR[/b]\r\nEs kann aber auch nach Inhalten gesucht werden, die möglicherweise nur einen der Suchbegriffe enthalten. Hierzu wird der OR-Operator verwendet.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]papagei OR rabe[/font] => Findet Inhalte mit "papagei" ODER "rabe"\r\n\r\n\r\n[b]Entweder-oder-Suche: XOR[/b]\r\nEine Verknüpfung mit dem XOR-Operator entspricht im Grundsatz der Suche mir OR. Der Unterschied besteht darin, dass aber nur solche Inhalte gefunden werden die nur einen der beiden Suchbegriffe enthalten, nicht aber beide zusammen.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]frau XOR mann[/font] => Findet Inhalte mit "frau" aber NICHT "mann" und umgekehrt\r\n\r\n\r\n[b]Suche nach Teilwörtern: *[/b]\r\nWenn nach bestimmten Teilwörtern gesucht wird, kann das Sternchen als Platzhalter verwendet werden. Vorangestellt werden Wörter gefunden, die auf den Suchbegriff enden; an letzter Stelle stehend findet die Suche nur Wörter die damit beginnen. Das Sternchen kann aber auch gleichzeitig vorne und hinten verwendet werden.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]*haus[/font] => Findet "Haus", "Wohnhaus", "Waisenhaus", aber NICHT "Hausboot"\r\n[font=monospace]tür*[/font] => Findet "Türschloss", "türmen", aber NICHT "Hintertür"\r\n[font=monospace]*wunder*[/font] => Findet "Wunderheiler", "Wirtschaftswunder" und "Verwunderung"\r\n\r\n\r\n[b]Suchbegriffe ausschließen: ![/b]\r\nUm bestimmte Begriffe aus den Suchergebnissen auszuschließen, kann ihnen ein Ausrufezeichen vorangestellt werden. So können Inhalte gefunden werden, die bestimmte Begriff nicht enthalten. Die anderen Suchregeln gelten weiterhin, insbesondere können Verknüpfungen verwendet werden.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]kind !junge[/font] => Findet Inhalte mit "kind" aber OHNE "junge"\r\n[font=monospace]maus katze !hund[/font] => Findet Inhalte mit "maus" UND "katze", aber OHNE "hund"\r\n[font=monospace]frosch OR !storch[/font] => Findet Inhalte die "frosch" ODER NICHT "Storch" enthalten\r\n\r\n\r\n[b]Phonetische Suche[/b]\r\nOft ist die genaue Schreibweise eines Wortes nicht bekannt. Dann kann die Phonetische Suche weiterhelfen. Mit dieser Option werden auch ähnlich klingende Begriffe zu einem Suchwort gefunden.\r\n\r\n[i]Beispiele:[/i]\r\n[font=monospace]team[/font] => Findet Inhalte mit "Team", "Tim", "Teen", etc.', 1, 1, 1, 1, 1400931683); -- -------------------------------------------------------- @@ -495,7 +495,7 @@ INSERT INTO `fs2_config` (`config_name`, `config_data`, `config_loadhook`) VALUE ('info', '{}', 'startup'), ('articles', '{"acp_per_page":"20","html_code":"2","fs_code":"4","para_handling":"4","cat_pic_x":"150","cat_pic_y":"150","cat_pic_size":"1024","com_rights":"0","com_antispam":"0","com_sort":"0","acp_view":"2"}', 'none'), ('search', '{"id":"0","search_num_previews":"10","search_and":"AND, and, &&","search_or":"OR, or, ||","search_xor":"XOR, xor","search_not":"!, -","search_wildcard":"*, %","search_min_word_length":"3","search_allow_phonetic":"1","search_use_stopwords":"1"}', 'none'), -('cronjobs', '{"last_cronjob_time":"1400614351","last_cronjob_time_daily":"1400614351","last_cronjob_time_hourly":"1400614351","search_index_update":"1","ref_cron":"1","ref_days":"5","ref_hits":"5","ref_contact":"first","ref_age":"older","ref_amount":"less"}', 'startup'), +('cronjobs', '{"last_cronjob_time":"1400931658","last_cronjob_time_daily":"1400931658","last_cronjob_time_hourly":"1400931658","search_index_update":"1","ref_cron":"1","ref_days":"5","ref_hits":"5","ref_contact":"first","ref_age":"older","ref_amount":"less"}', 'startup'), ('captcha', '{"captcha_bg_color":"FAFCF1","captcha_bg_transparent":"0","captcha_text_color":"AB30AB","captcha_first_lower":"1","captcha_first_upper":"5","captcha_second_lower":"1","captcha_second_upper":"5","captcha_use_addition":"1","captcha_use_subtraction":"1","captcha_use_multiplication":"0","captcha_create_easy_arithmetics":"1","captcha_x":"58","captcha_y":"18","captcha_show_questionmark":"0","captcha_use_spaces":"1","captcha_show_multiplication_as_x":"1","captcha_start_text_x":"0","captcha_start_text_y":"0","captcha_font_size":"5","captcha_font_file":""}', 'none'), ('downloads', '{"screen_x":"1024","screen_y":"768","thumb_x":"120","thumb_y":"90","quickinsert":"test''","dl_rights":"2","dl_show_sub_cats":"0","dl_comments":"1"}', 'none'), ('affiliates', '{"partner_anzahl":"5","small_x":"88","small_y":"31","big_x":"468","big_y":"60","big_allow":"1","file_size":"1024","small_allow":"0"}', 'none'), @@ -531,7 +531,7 @@ CREATE TABLE IF NOT EXISTS `fs2_counter` ( -- INSERT INTO `fs2_counter` (`id`, `visits`, `hits`, `user`, `artikel`, `news`, `comments`) VALUES -(1, 108, 3333, 5, 7, 18, 3); +(1, 109, 3338, 5, 7, 18, 3); -- -------------------------------------------------------- @@ -666,7 +666,8 @@ INSERT INTO `fs2_counter_stat` (`s_year`, `s_month`, `s_day`, `s_visits`, `s_hit (2014, 4, 6, 1, 5), (2014, 4, 12, 1, 12), (2014, 4, 13, 1, 3), -(2014, 5, 20, 1, 8); +(2014, 5, 20, 1, 8), +(2014, 5, 24, 1, 5); -- -------------------------------------------------------- @@ -1938,7 +1939,7 @@ CREATE TABLE IF NOT EXISTS `fs2_useronline` ( -- INSERT INTO `fs2_useronline` (`ip`, `user_id`, `date`) VALUES -('::1', 1, 1400614604); +('::1', 1, 1400931685); -- -------------------------------------------------------- diff --git a/www/admin/admin_articles_edit.php b/www/admin/admin_articles_edit.php index 1b42050..11a3bf7 100644 --- a/www/admin/admin_articles_edit.php +++ b/www/admin/admin_articles_edit.php @@ -857,6 +857,9 @@ function db_delete_article ( $DATA ) else { // Filter + if (!isset($_REQUEST)) { + $_REQUEST = array(); + } $_REQUEST = default_set_filter_data ( $_REQUEST ); default_display_filter ( $_REQUEST ); diff --git a/www/applets/poll-system.php b/www/applets/poll-system.php index d311c29..1e5b0e8 100644 --- a/www/applets/poll-system.php +++ b/www/applets/poll-system.php @@ -18,6 +18,7 @@ $poll_arr = $FD->sql()->conn()->query('SELECT * FROM '.$FD->config('pref').'poll WHERE poll_id = '.intval($SCRIPT['argv'][1]).' LIMIT 1'); $poll_arr = $poll_arr->fetch(PDO::FETCH_ASSOC); } catch (Exception $e) { + $poll_arr = array(); } // random option @@ -45,6 +46,7 @@ $poll_arr = $poll_arr->fetch(PDO::FETCH_ASSOC); $poll_arr['random'] = true; } catch (Exception $e) { + $poll_arr = array(); } // last poll @@ -63,12 +65,12 @@ if ( ( isset($_POST['poll_id']) && ($_POST['poll_id'] === $poll_arr['poll_id'] || $poll_arr['random'] === true) - || checkVotedPoll($poll_arr['poll_id']) + || (isset($poll_arr['poll_id']) && checkVotedPoll($poll_arr['poll_id'])) || (isset($poll_arr['poll_end']) && time() > $poll_arr['poll_end']) ) ) { - if ($poll_arr['random'] === true && isset($_POST['poll_id'])) { + if (isset($_POST['random']) && $poll_arr['random'] === true && isset($_POST['poll_id'])) { $poll_arr['poll_id'] = $_POST['poll_id']; settype($poll_arr['poll_id'], 'integer'); } From 3ea0e461559a8ad0b29b6ad58673c3e56b119a96 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Sun, 1 Jun 2014 19:34:15 +0200 Subject: [PATCH 42/45] Content Image Size Fix --- www/admin/admin_cimg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/admin/admin_cimg.php b/www/admin/admin_cimg.php index 5d5dd2e..28c0157 100644 --- a/www/admin/admin_cimg.php +++ b/www/admin/admin_cimg.php @@ -46,7 +46,7 @@ if (!image_exists('media/content/',$_POST['newname']) AND !image_exists('media/content/',$_POST['newname'].'_s')) { - $upload = upload_img($_FILES['cimg'], 'media/content/', $_POST['newname'], 1024*1024, 9999, 9999); + $upload = upload_img($_FILES['cimg'], 'media/content/', $_POST['newname'], 1024*1024*5, 9999, 9999); $message = upload_img_notice ( $upload ); if ($make_thumb) { $thumb = create_thumb_from ( image_url ( 'media/content/', $_POST['newname'], FALSE, TRUE ) , $_POST['width'], $_POST['height'] ); From 6bd316c3d6d359b61294dfa878c76a94e1e4ea75 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Sun, 1 Jun 2014 19:50:33 +0200 Subject: [PATCH 43/45] =?UTF-8?q?Fix=20f=C3=BCr=20die=20Artikel=20Ansicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Es konnte passieren, dass tags nicht abgeschlossen wurden und so das Layout zerstört wurde. Dies wurde hier recht einfach gefixt. --- www/admin/admin_articles_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/admin/admin_articles_edit.php b/www/admin/admin_articles_edit.php index 11a3bf7..f01033e 100644 --- a/www/admin/admin_articles_edit.php +++ b/www/admin/admin_articles_edit.php @@ -156,7 +156,7 @@ function default_get_entry_data ( $articles_arr ) // Only for full view if ($config_arr['acp_view'] == 1) { - $articles_arr['article_text_short'] = truncate_string ( killfs ( $articles_arr['article_text'] ) , 250, "..." ); + $articles_arr['article_text_short'] = truncate_string ( strip_tags(killfs ( $articles_arr['article_text'] )) , 250, "..." ); } return $articles_arr; @@ -570,7 +570,7 @@ function action_delete_get_data ( $ARTICLE_ID ) $articles_arr['article_date_formated'] = ''; } - $articles_arr['article_text_short'] = truncate_string ( killfs ( $articles_arr['article_text'] ) , 250, '...' ); + $articles_arr['article_text_short'] = truncate_string ( strip_tags(killfs ( $articles_arr['article_text'] )) , 250, '...' ); if ( $articles_arr['article_user'] != 0 ) { $index2 = $FD->sql()->conn()->query('SELECT user_name FROM '.$FD->config('pref').'user WHERE user_id = '.$articles_arr['article_user']); From d44fe663cb43371f0dfdd4acd1b11598f5a707e6 Mon Sep 17 00:00:00 2001 From: Mainclain Date: Sun, 1 Jun 2014 20:10:25 +0200 Subject: [PATCH 44/45] Fix News Preview text --- www/admin/admin_news_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/admin/admin_news_edit.php b/www/admin/admin_news_edit.php index 39b5651..2dbc8f8 100644 --- a/www/admin/admin_news_edit.php +++ b/www/admin/admin_news_edit.php @@ -982,7 +982,7 @@ function action_comments_delete ( $DATA ) } // full if ($config_arr['acp_view'] == 1) { // extened - $text_preview = cut_string(killfs($news['news_text']), 250, '...'); + $text_preview = cut_string(strip_tags(killfs($news['news_text'])), 250, '...'); $adminpage->addText('text_preview', $text_preview); } From d995317d9931a2f18022c1b938ff4dd127be7cb1 Mon Sep 17 00:00:00 2001 From: Sweil Date: Sat, 7 Jun 2014 22:43:26 +0200 Subject: [PATCH 45/45] fixed dls Signed-off-by: Sweil --- www/admin/admin_dladd.php | 2 +- www/admin/admin_dledit.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/admin/admin_dladd.php b/www/admin/admin_dladd.php index 3ceb13c..4b0cf04 100644 --- a/www/admin/admin_dladd.php +++ b/www/admin/admin_dladd.php @@ -4,7 +4,7 @@ //// Add Download //// ////////////////////// -if (isset($_POST['dladd']) && isset($_POST['title']) && isset($_POST['text'])) +if (isset($_POST['dladd']) && isset($_POST['title']) && isset($_POST['text']) && !isset($_POST['files_add'])) { settype ($_POST['catid'], 'integer'); settype ($_POST['userid'], 'integer'); diff --git a/www/admin/admin_dledit.php b/www/admin/admin_dledit.php index 8b4399e..e8554a0 100644 --- a/www/admin/admin_dledit.php +++ b/www/admin/admin_dledit.php @@ -4,7 +4,7 @@ //// Download udpate //// ///////////////////////// -if (isset($_POST['dledit']) && isset($_POST['title']) && isset($_POST['text'])) +if (isset($_POST['dledit']) && isset($_POST['title']) && isset($_POST['text']) && !isset($_POST['files_add'])) { settype ($_POST['editdlid'], 'integer'); @@ -118,7 +118,7 @@ ////// Edit Download ////// /////////////////////////// -if (isset($_POST['dlid']) || isset($_POST['optionsadd'])) +if (isset($_POST['dlid']) || isset($_POST['dlid']) && isset($_POST['files_add']) && isset($_POST['optionsadd'])) { $_POST['dlid'] = $_POST['dlid'][0]; if(isset($_POST['sended']) && !isset($_POST['files_add'])) {