[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt,1.14,1.15 mod_sql_body.tpl,1.2,1.
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt,1.14,1.15 mod_sql_body.tpl,1.2,1.3
|
From: Jim W. <ter...@us...> - 2005-06-12 08:18:44
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10241/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_sql_body.tpl Log Message: - Fixed a few language errors - Replaced a few <br>'s with <br /> Index: mod_sql_body.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_sql_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mod_sql_body.tpl 3 Jun 2005 22:59:12 -0000 1.2 --- mod_sql_body.tpl 12 Jun 2005 08:18:35 -0000 1.3 *************** *** 24,28 **** </tr> </table> ! <br> <!-- END drop_warning --> --- 24,28 ---- </tr> </table> ! <br /> <!-- END drop_warning --> *************** *** 47,51 **** </tr> </table> ! <br> <!-- END msaccess --> --- 47,51 ---- </tr> </table> ! <br /> <!-- END msaccess --> *************** *** 61,71 **** </tr> <tr> ! <td width="100%" align="center"><span class="gen"><b>{L_SQL_HALTED}</b><br> ! <br>{L_SQL_ERROR_EXPLAIN}<br> ! <br> ! {L_FAILED_LINE}:<br> ! {sql_error.LINE}<br> ! <br> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br> {sql_error.ERROR_MSG}</span></td> </tr> --- 61,71 ---- </tr> <tr> ! <td width="100%" align="center"><span class="gen"><b>{L_SQL_HALTED}</b><br /> ! <br />{L_SQL_ERROR_EXPLAIN}<br /> ! <br /> ! {L_FAILED_LINE}:<br /> ! {sql_error.LINE}<br /> ! <br /> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br /> {sql_error.ERROR_MSG}</span></td> </tr> *************** *** 77,81 **** </tr> </table> ! <br> <!-- END sql_error --> --- 77,81 ---- </tr> </table> ! <br /> <!-- END sql_error --> *************** *** 118,126 **** <tr> <td width="100%" align="center"><span class="gen"> ! <b>{L_SQL_PROCESS_ERROR}:</b><br> ! <b>{L_NO_SQL_PREFORMED}<br> ! <br> ! {L_FOLLOWING_ERROR}:<br> ! <br> {error.ERROR_MSG} </span></td> --- 118,126 ---- <tr> <td width="100%" align="center"><span class="gen"> ! <b>{L_SQL_PROCESS_ERROR}:</b><br /> ! <b>{L_NO_SQL_PREFORMED}<br /> ! <br /> ! {L_FOLLOWING_ERROR}:<br /> ! <br /> {error.ERROR_MSG} </span></td> Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_easymod.php.txt 11 Jun 2005 23:31:32 -0000 1.14 --- admin_easymod.php.txt 12 Jun 2005 08:18:35 -0000 1.15 *************** *** 110,114 **** for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br>\n" ; $line .= htmlspecialchars($body[$i]) ; } --- 110,114 ---- for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br />\n" ; $line .= htmlspecialchars($body[$i]) ; } *************** *** 141,145 **** for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br>\n" ; $line .= htmlspecialchars($body[$i]) ; } --- 141,145 ---- for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br />\n" ; $line .= htmlspecialchars($body[$i]) ; } *************** *** 163,172 **** return ; } - - $template->assign_vars(array( - 'L_SQL_PROCESS_ERROR' => $lang['EM_sql_process_error'], - 'L_NO_SQL_PREFORMED' => $lang['EM_no_sql_preformed'], - 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], - )); $template->assign_block_vars('error', array( --- 163,166 ---- *************** *** 471,475 **** // show the error(s); do this last in case file repro throw another error ! display_error( $file_list[$err]->err_msg . "<br>\n" . $lang['EM_line_num'] . $line) ; } --- 465,469 ---- // show the error(s); do this last in case file repro throw another error ! display_error( $file_list[$err]->err_msg . "<br />\n" . $lang['EM_line_num'] . $line) ; } *************** *** 680,684 **** { $get_password = true ; ! $pass_message = '<b>' . $lang['EM_err_pw_fail'] . '</b><br>' ; } } --- 674,678 ---- { $get_password = true ; ! $pass_message = '<b>' . $lang['EM_err_pw_fail'] . '</b><br />' ; } } *************** *** 992,996 **** em_db_update( 'EM_version', $em_version) ; ! message_die( GENERAL_MESSAGE, '<br>' . $lang['EM_settings_success'] . " $pass_msg<br><br>") ; } --- 986,990 ---- em_db_update( 'EM_version', $em_version) ; ! message_die( GENERAL_MESSAGE, '<br />' . $lang['EM_settings_success'] . " $pass_msg<br /><br />") ; } *************** *** 1719,1723 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[1]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br>' . $command_file->err_msg . '<br>') ; } --- 1713,1717 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[1]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br />' . $command_file->err_msg . '<br />') ; } *************** *** 1747,1751 **** if ((count($find_array) == 0 ) && (($commands[$i]['command'] == 'BEFOREADD') || (strstr($commands[$i]['command'], 'IN-LINE')))) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_no_find'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1741,1745 ---- if ((count($find_array) == 0 ) && (($commands[$i]['command'] == 'BEFOREADD') || (strstr($commands[$i]['command'], 'IN-LINE')))) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_no_find'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1777,1781 **** for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $file_list[$errs]->err_msg . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } --- 1771,1775 ---- for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $file_list[$errs]->err_msg . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } *************** *** 1790,1794 **** if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_comm_open'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1784,1788 ---- if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_comm_open'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1842,1846 **** if ( count($search_array) == 0 ) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_comm_find'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1836,1840 ---- if ( count($search_array) == 0 ) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_comm_find'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1941,1945 **** if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1935,1939 ---- if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1949,1953 **** if (!preg_match('#(%\:\d+)\s*([\+\-]\d+)?#',trim($body[$i][0]),$inc_data)) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break; } --- 1943,1947 ---- if (!preg_match('#(%\:\d+)\s*([\+\-]\d+)?#',trim($body[$i][0]),$inc_data)) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break; } *************** *** 1980,1984 **** if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_inline_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1974,1978 ---- if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_inline_body'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1987,1991 **** if (($search_fragment == '') && ($commands[$i]['command'] != 'IN-LINE FIND')) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_no_ifind'] . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); break ; } --- 1981,1985 ---- if (($search_fragment == '') && ($commands[$i]['command'] != 'IN-LINE FIND')) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_no_ifind'] . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); break ; } *************** *** 2118,2122 **** { //echo "1<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_copy_format'] . '<br>' . trim($body[$i][$j]) . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; --- 2112,2116 ---- { //echo "1<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_copy_format'] . '<br />' . trim($body[$i][$j]) . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; *************** *** 2128,2132 **** { //echo "2<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_copy_format'] . '<br>' . trim($body[$i][$j]) . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; --- 2122,2126 ---- { //echo "2<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_copy_format'] . '<br />' . trim($body[$i][$j]) . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; *************** *** 2218,2222 **** { //echo "3 [$install_path][$tmp_from_dir]<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_copy_format'] . '<br>' . trim($body[$i][$j]) . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; --- 2212,2216 ---- { //echo "3 [$install_path][$tmp_from_dir]<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_copy_format'] . '<br />' . trim($body[$i][$j]) . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; *************** *** 2310,2314 **** for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $file_list[$errs]->err_msg . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } --- 2304,2308 ---- for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $file_list[$errs]->err_msg . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } *************** *** 2694,2699 **** $template->assign_vars(array( 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], ! 'L_URGENT_WARNING' => $lang['EM_urgent_warning'], ! )); $drop_warning = true ; } --- 2688,2693 ---- $template->assign_vars(array( 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], ! 'L_URGENT_WARNING' => $lang['EM_urgent_warning']) ! ); $drop_warning = true ; } *************** *** 2717,2722 **** $template->assign_block_vars('experimental', array()); $template->assign_vars(array( ! 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link) ! )); } --- 2711,2716 ---- $template->assign_block_vars('experimental', array()); $template->assign_vars(array( ! 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link)) ! ); } *************** *** 2743,2746 **** --- 2737,2744 ---- 'L_NOTICE' => $lang['EM_notice'], + 'L_SQL_PROCESS_ERROR' => $lang['EM_sql_process_error'], + 'L_NO_SQL_PREFORMED' => $lang['EM_no_sql_preformed'], + 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], + 'THEMES' => $themes, 'LANGUAGES' => $languages, *************** *** 2813,2817 **** //echo "[" . $error['message'] . "][" . $error['code'] . "]<br>\n" ; //exit ; - // load up an error message $template->assign_block_vars( 'sql_error', array( --- 2811,2814 ---- *************** *** 2821,2829 **** ); $template->assign_vars(array( ! 'L_SQL_ERROR' => $lang['EM_sql_msaccess_warning'], 'L_SQL_ERROR_EXPLAIN' => $lang['EM_sql_error_explain'], 'L_FAILED_LINE' => $lang['EM_failed_line'], ! 'L_SQL_HALTED' => $lang['EM_sql_halted'], ! )); } else --- 2818,2826 ---- ); $template->assign_vars(array( ! 'L_SQL_ERROR' => $lang['EM_sql_error'], 'L_SQL_ERROR_EXPLAIN' => $lang['EM_sql_error_explain'], 'L_FAILED_LINE' => $lang['EM_failed_line'], ! 'L_SQL_HALTED' => $lang['EM_sql_halted']) ! ); } else *************** *** 2956,2961 **** if (( !$command_file->modio_open(true)) || ( !$command_bat->modio_open(true))) { ! $command_file->err_msg = $lang['EM_trace'] . ':<br> main[2]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<br>' . $lang['EM_err_open_pp'] . '<br>' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br>') ; } --- 2953,2958 ---- if (( !$command_file->modio_open(true)) || ( !$command_bat->modio_open(true))) { ! $command_file->err_msg = $lang['EM_trace'] . ':<br /> main[2]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<br />' . $lang['EM_err_open_pp'] . '<br />' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br />') ; } *************** *** 2965,2969 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[3]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br> ' . $command_file->err_msg . '<br>') ; } // share FTP attributes with the bat file --- 2962,2966 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[3]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br /> ' . $command_file->err_msg . '<br />') ; } // share FTP attributes with the bat file *************** *** 3027,3031 **** if ($ret_value == '') { ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b> ' . $command_file->err_msg . '<br>' . $lang['EM_err_attempt_remainder'] . '<br>') ; } --- 3024,3028 ---- if ($ret_value == '') { ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b> ' . $command_file->err_msg . '<br />' . $lang['EM_err_attempt_remainder'] . '<br />') ; } *************** *** 3124,3128 **** if ((!$command_file->modio_close(true)) || (!$command_bat->modio_close(true))) { ! message_die( GENERAL_ERROR, '<br>' . $lang['EM_err_write_pp'] . '<br>' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br>') ; } --- 3121,3125 ---- if ((!$command_file->modio_close(true)) || (!$command_bat->modio_close(true))) { ! message_die( GENERAL_ERROR, '<br />' . $lang['EM_err_write_pp'] . '<br />' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br />') ; } |
