Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1897) +++ branches/2.8.x/CHANGELOG (revision 1898) @@ -13,6 +13,12 @@ +03 Apr-2013 Build 1898 Dietmar Woellbrink (Luisehahne) +# bugfix missing trailing backtick in output_filter/input.php +# bugfix wrong backticks in 'admin/media/upload.php +# bugfix add missing language variable in account +! update form module, add class frm-fieldset to fieldset, restyle error box +! update captcha iframe attribute settings 21 Mar-2013 Build 1897 Dietmar Woellbrink (Luisehahne) # SqlImport removes BOM in sql files in a Windows Environment otherwise you have an error in your SQL syntax; Index: branches/2.8.x/wb/include/captcha/captcha.php =================================================================== --- branches/2.8.x/wb/include/captcha/captcha.php (revision 1897) +++ branches/2.8.x/wb/include/captcha/captcha.php (revision 1898) @@ -5,8 +5,8 @@ * @package include * @subpackage * @author Ryan Djurovich,WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher @@ -112,20 +112,20 @@ // get width and height of captcha image for use in  =  - + @@ -253,4 +253,3 @@ } } } - Index: branches/2.8.x/wb/admin/media/upload.php =================================================================== --- branches/2.8.x/wb/admin/media/upload.php (revision 1897) +++ branches/2.8.x/wb/admin/media/upload.php (revision 1898) @@ -4,13 +4,13 @@ * @category admin * @package media * @author Ryan Djurovich,WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -67,8 +67,8 @@ $file_extension_string = ''; // Get list of file types to which we're supposed to append 'txt' -$sql = 'SELECT ´value´ FROM ´'.TABLE_PREFIX. 'settings´ '. - 'WHERE ´name´=\'rename_files_on_upload\''; +$sql = 'SELECT `value` FROM `'.TABLE_PREFIX. 'settings` '. + 'WHERE `name`=\'rename_files_on_upload\''; if($oRes = $database->query($sql)) { $aResult = $oRes->fetchRow(MYSQL_ASSOC); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1897) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1898) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1897'); +if(!defined('REVISION')) define('REVISION', '1898'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/account/languages/EN.php =================================================================== --- branches/2.8.x/wb/account/languages/EN.php (revision 1897) +++ branches/2.8.x/wb/account/languages/EN.php (revision 1898) @@ -156,3 +156,4 @@ $TEXT['ACTIVATION'] = 'Activate'; $TEXT['SEND'] = 'Request'; $TEXT['USERNAME'] = 'Login name'; +$TEXT['INFO'] = ''; Index: branches/2.8.x/wb/account/languages/DE.php =================================================================== --- branches/2.8.x/wb/account/languages/DE.php (revision 1897) +++ branches/2.8.x/wb/account/languages/DE.php (revision 1898) @@ -163,3 +163,4 @@ $TEXT['ACTIVATION'] = 'Freischalten'; $TEXT['SEND'] = 'Anfordern'; $TEXT['USERNAME'] = 'Loginname'; +$TEXT['INFO'] = ''; Index: branches/2.8.x/wb/account/signup_form.php =================================================================== --- branches/2.8.x/wb/account/signup_form.php (revision 1897) +++ branches/2.8.x/wb/account/signup_form.php (revision 1898) @@ -4,13 +4,13 @@ * @category frontend * @package account * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -102,7 +102,7 @@ // login label vars $oTpl->set_var(array( - 'TEXT_INFO' => $SFS_TEXT['INFO'], + 'TEXT_INFO' => $TEXT['INFO'], 'TEXT_USERNAME' => $TEXT['USERNAME'], 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], 'TEXT_EMAIL' => $TEXT['EMAIL'], Index: branches/2.8.x/wb/modules/form/info.php =================================================================== --- branches/2.8.x/wb/modules/form/info.php (revision 1897) +++ branches/2.8.x/wb/modules/form/info.php (revision 1898) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ Index: branches/2.8.x/wb/modules/form/view.php =================================================================== --- branches/2.8.x/wb/modules/form/view.php (revision 1897) +++ branches/2.8.x/wb/modules/form/view.php (revision 1898) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -162,7 +162,7 @@ if($query_fields->numRows() > 0) { ?> 0) AND (false == $use_xhtml_strict) ) ? "id=\"".$form_name.$section_id."\"" : ""); ?> action="" method="post"> -
+
\n"; if(!isset($MESSAGE['MOD_FORM_REQUIRED_FIELDS'])) { echo '

You must enter details for the following fields

'; } else { echo '

'.$MESSAGE['MOD_FORM_REQUIRED_FIELDS'].'

'; } - echo "
    \n"; + echo "
      \n"; foreach($required AS $field_title) { if($field_title!=''){ echo '
    1. '.$field_title."
      2. \n"; } } - if(isset($email_error)) { echo '
    2. '.$email_error."
      3. \n"; } - if(isset($captcha_error)) { echo '
    3. '.$captcha_error."
      4. \n"; } @@ -479,21 +477,25 @@ // Create blank "required" array $required = array(); echo "
    \n"; - - echo '

     

    '."\n".'

    '.$TEXT['BACK'].'

    '."\n"; + echo "\n"; + echo '

    '.$TEXT['BACK'].'

    '."\n"; } else { if(isset($email_error)) { - echo '
      '."\n"; + echo "
      \n"; + echo '
        '."\n"; echo '
      1. '.$email_error.'
        2. '."\n"; echo '
      '."\n"; - echo ''.$TEXT['BACK'].''; + echo "
      \n"; + echo '

      '.$TEXT['BACK'].'

      '."\n"; } elseif(isset($captcha_error)) { - echo '
        '."\n"; + echo "
        \n"; + echo '
          '."\n"; echo '
        1. '.$captcha_error.'
          2. '."\n"; echo '
        '."\n"; - echo '

         

        '."\n".'

        '.$TEXT['BACK'].'

        '."\n"; + echo "
        \n"; + echo '

        '.$TEXT['BACK'].'

        '."\n"; } else { - // Check how many times form has been submitted in last hour +// Check how many times form has been submitted in last hour $last_hour = time()-3600; $sql = 'SELECT `submission_id` FROM `'.TABLE_PREFIX.'mod_form_submissions` '; $sql .= 'WHERE `submitted_when` >= '.$last_hour.''; @@ -502,7 +504,7 @@ { if($query_submissions->numRows() > $max_submissions) { - // Too many submissions so far this hour +// Too many submissions so far this hour echo $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS']; $success = false; } else { Index: branches/2.8.x/wb/modules/form/frontend.css =================================================================== --- branches/2.8.x/wb/modules/form/frontend.css (revision 1897) +++ branches/2.8.x/wb/modules/form/frontend.css (revision 1898) @@ -1,26 +1,32 @@ -.frm-field_table { width :100%; vertical-align :middle; table-layout :auto; border-collapse :separate; border :none; } -.frm-field_table tbody { font-size : 100%; padding :0.4em 0.2em; } -.frm-field_table tbody td { border :none; } -.frm-field_table tbody td.field_heading, -.frm-field_table tbody td.frm-field_heading { border-bottom :2px solid #666666; color :#666666; font-weight :bold; padding-top :0.5em; } -.frm-required { color :#ff0000; } -.frm-field_title { width :25%; vertical-align :top; white-space :nowrap; text-align :right; } -.frm-textfield { width :90%; } -.frm-textarea { width :100%; height :100px; } -.frm-select { width :50%; } -.frm-select option { width :95%; } -.frm-field_checkbox { cursor :pointer; width :2em; vertical-align :middle; } -.frm-checkbox_label { cursor :pointer; vertical-align :middle; } -.frm-radio_label { cursor :pointer; } -.frm-email { width : 90%; } -/*** Don't remove the class nixhier, this is required for ASP ***/ -.nixhier, -.frm-nixhier { display :none; } -.frm-submission { margin :0 auto; position :relative; width :auto; } -.print-email { font-size :0.8em; color :#000; margin :10px auto; } -.frm-warning { background :#ffeeee; border :0.2em #884444 solid; color :#e10000; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; } -.frm-note { background :#eeffee; border :0.2em #448844 solid; color :#004400; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; } -.previewPrintTop { text-align :right; } -.previewPrintTop img { padding-left :1em; } -.frm-thankyou { } -.frm-tbody { } +.frm-field_table { width :100%; vertical-align :middle; table-layout :auto; border-collapse :separate; border :none; } +.frm-field_table tbody { font-size :100%; padding :0.4em 0.2em; } +.frm-field_table tbody td { border :none; } +.frm-field_table tbody td.field_heading, +.frm-field_table tbody td.frm-field_heading { border-bottom :2px solid #666666; color :#666666; font-weight :bold; padding-top :0.5em; } +.frm-required { color :#FF0000; } +.frm-field_title { width :25%; vertical-align :top; white-space :nowrap; text-align :right; } +.frm-textfield { width :90%; } +.frm-textarea { width :100%; height :100px; } +.frm-select { width :50%; } +.frm-select option { width :95%; } +.frm-field_checkbox { cursor :pointer; width :2em; vertical-align :middle; } +.frm-checkbox_label { cursor :pointer; vertical-align :middle; } +.frm-radio_label { cursor :pointer; } +.frm-email { width :90%; } +/*** Don't remove the class nixhier, this is required for ASP ***/ +.nixhier, +.frm-nixhier { display :none; } +.frm-submission { margin :0 auto; position :relative; width :auto; } +.print-email { font-size :0.8em; color :#000000; margin :10px auto; } +.frm-warning { background :#FFEEEE; border :0.1em #884444 solid; color :#E10000; margin-bottom :1em; padding :0.5em 2.8em; font-size :96.5%; font-weight :normal; } +.frm-note { background :#EEFFEE; border :0.2em #448844 solid; color :#004400; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; } +.previewprinttop { text-align :right; } +.previewprinttop img { padding-left :1em; } +.frm-thankyou { } +.frm-tbody { } +.frm-warning h3 { font-size :120%; line-height :1.3em; margin :0.1em; padding :0.1em; } + .frm-warning ol { color :#333333; margin :0.1em; } +.frm-field_table input[type="submit"] { padding :0.1em 0.8em; } + .frm-warning a, + p.frm-warning a { background :transparent; padding-left :0; } +fieldset.frm-fieldset { border :none; } \ No newline at end of file Index: branches/2.8.x/wb/modules/form/add.php =================================================================== --- branches/2.8.x/wb/modules/form/add.php (revision 1897) +++ branches/2.8.x/wb/modules/form/add.php (revision 1898) @@ -4,84 +4,76 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ -// Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

        Cannot access this file directly

        '); -} -/* -------------------------------------------------------- */ +if(!defined('WB_PATH')) { + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); +} else { + $table_name = TABLE_PREFIX.'mod_form_settings'; + $field_name = 'perpage_submissions'; + $description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`"; + if(!$database->field_exists($table_name,$field_name)) { + $database->field_add($table_name, $field_name, $description); + } -// ------------------------------------ -$table_name = TABLE_PREFIX.'mod_form_settings'; -$field_name = 'perpage_submissions'; -$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`"; -if(!$database->field_exists($table_name,$field_name)) { - $database->field_add($table_name, $field_name, $description); -} -// ------------------------------------ - -// Insert an extra rows into the database -$header = '
- "> - " alt="Captcha" /> + " > + " alt="Captcha" style="margin: 0;padding: 0;" />
'; -$field_loop = ''.PHP_EOL.''.PHP_EOL.''.PHP_EOL.''; -$footer = ''.PHP_EOL.''.PHP_EOL.' + // Insert an extra rows into the database + $header = '
{TITLE}{REQUIRED}:{FIELD}
 
'; + $field_loop = ''.PHP_EOL.''.PHP_EOL.''.PHP_EOL.''; + $footer = ''.PHP_EOL.' '.PHP_EOL.' '.PHP_EOL.'
{TITLE}{REQUIRED}:{FIELD}
'.PHP_EOL.' '.PHP_EOL.'
'.PHP_EOL; -$email_to = ''; -$email_from = ''; -$email_fromname = ''; -$email_subject = ''; -$success_page = 'none'; -$success_email_to = ''; -$success_email_from = ''; -$success_email_fromname = ''; -$success_email_text = ''; -// $success_email_text = addslashes($success_email_text); -$success_email_subject = ''; -$max_submissions = 50; -$stored_submissions = 50; -$perpage_submissions = 10; -$use_captcha = true; - -// $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id,header,field_loop,footer,email_to,email_from,email_fromname,email_subject,success_page,success_email_to,success_email_from,success_email_fromname,success_email_text,success_email_subject,max_submissions,stored_submissions,use_captcha) VALUES ('$page_id','$section_id','$header','$field_loop','$footer','$email_to','$email_from','$email_fromname','$email_subject','$success_page','$success_email_to','$success_email_from','$success_email_fromname','$success_email_text','$success_email_subject','$max_submissions','$stored_submissions','$use_captcha')"); - -// Insert settings -$sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_form_settings` SET '; -$sql .= '`section_id` = \''.$section_id.'\', '; -$sql .= '`page_id` = \''.$page_id.'\', '; -$sql .= '`header` = \''.$header.'\', '; -$sql .= '`field_loop` = \''.$field_loop.'\', '; -$sql .= '`footer` = \''.$footer.'\', '; -$sql .= '`email_to` = \''.$email_to.'\', '; -$sql .= '`email_from` = \''.$email_from.'\', '; -$sql .= '`email_fromname` = \''.$email_fromname.'\', '; -$sql .= '`email_subject` = \''.$email_subject.'\', '; -$sql .= '`success_page` = \''.$success_page.'\', '; -$sql .= '`success_email_to` = \''.$success_email_to.'\', '; -$sql .= '`success_email_from` = \''.$success_email_from.'\', '; -$sql .= '`success_email_fromname` = \''.$success_email_fromname.'\', '; -$sql .= '`success_email_text` = \''.$success_email_text.'\', '; -$sql .= '`success_email_subject` = \''.$success_email_subject.'\', '; -$sql .= '`max_submissions` = \''.$max_submissions.'\', '; -$sql .= '`stored_submissions` = \''.$stored_submissions.'\', '; -$sql .= '`perpage_submissions` = \''.$perpage_submissions.'\', '; -$sql .= '`use_captcha` = \''.$use_captcha.'\' '; -$sql .= ''; -if($database->query($sql)) { - // $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $email_to = ''; + $email_from = ''; + $email_fromname = ''; + $email_subject = ''; + $success_page = 'none'; + $success_email_to = ''; + $success_email_from = ''; + $success_email_fromname = ''; + $success_email_text = ''; + // $success_email_text = addslashes($success_email_text); + $success_email_subject = ''; + $max_submissions = 50; + $stored_submissions = 50; + $perpage_submissions = 10; + $use_captcha = true; + + // Insert settings + $sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_form_settings` SET '; + $sql .= '`section_id` = \''.$section_id.'\', '; + $sql .= '`page_id` = \''.$page_id.'\', '; + $sql .= '`header` = \''.$header.'\', '; + $sql .= '`field_loop` = \''.$field_loop.'\', '; + $sql .= '`footer` = \''.$footer.'\', '; + $sql .= '`email_to` = \''.$email_to.'\', '; + $sql .= '`email_from` = \''.$email_from.'\', '; + $sql .= '`email_fromname` = \''.$email_fromname.'\', '; + $sql .= '`email_subject` = \''.$email_subject.'\', '; + $sql .= '`success_page` = \''.$success_page.'\', '; + $sql .= '`success_email_to` = \''.$success_email_to.'\', '; + $sql .= '`success_email_from` = \''.$success_email_from.'\', '; + $sql .= '`success_email_fromname` = \''.$success_email_fromname.'\', '; + $sql .= '`success_email_text` = \''.$success_email_text.'\', '; + $sql .= '`success_email_subject` = \''.$success_email_subject.'\', '; + $sql .= '`max_submissions` = \''.$max_submissions.'\', '; + $sql .= '`stored_submissions` = \''.$stored_submissions.'\', '; + $sql .= '`perpage_submissions` = \''.$perpage_submissions.'\', '; + $sql .= '`use_captcha` = \''.$use_captcha.'\' '; + $sql .= ''; + if($database->query($sql)) { + // $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + } } Index: branches/2.8.x/wb/modules/output_filter/index.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/index.php (revision 1897) +++ branches/2.8.x/wb/modules/output_filter/index.php (revision 1898) @@ -4,13 +4,13 @@ * @category modules * @package output_filter * @author Christian Sommer, WB-Project, Werner v.d. Decken - * @copyright 2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2011, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.2 * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -90,7 +90,7 @@ // be sure field 'sys_rel' is in table $database->field_add( TABLE_PREFIX.'mod_output_filter', 'sys_rel', 'INT NOT NULL DEFAULT \'0\' FIRST'); // request settings from database - $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_output_filter'; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_output_filter` '; if(($res = $database->query($sql))) { if(($rec = $res->fetchRow())) { $settings = $rec;