|
From: Jon O. <jon...@us...> - 2005-10-24 20:19:10
|
Update of /cvsroot/mxbb/mx_sitestats/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2225/modules/mx_sitestats/admin Modified Files: admin_counter.php admin_referers.php admin_sitestats.php Log Message: replaced all message_die with mx_message_die Index: admin_referers.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/admin/admin_referers.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_referers.php 23 Oct 2005 18:52:36 -0000 1.2 --- admin_referers.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 71,75 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't update HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } --- 71,75 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } *************** *** 82,86 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't delete HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } --- 82,86 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } *************** *** 91,95 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't delete HTTP Referers from database", '', __LINE__, __FILE__, $sql ); } } --- 91,95 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete HTTP Referers from database", '', __LINE__, __FILE__, $sql ); } } *************** *** 103,107 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Could not query SiteStats TopReferers block information", "", __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 103,107 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query SiteStats TopReferers block information", "", __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 139,143 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 139,143 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 146,150 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 146,150 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 173,177 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Information", '', __LINE__, __FILE__, $sql ); } $rowset = $db->sql_fetchrowset( $result ); --- 173,177 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Information", '', __LINE__, __FILE__, $sql ); } $rowset = $db->sql_fetchrowset( $result ); Index: admin_sitestats.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/admin/admin_sitestats.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_sitestats.php 15 Oct 2005 22:18:28 -0000 1.1 --- admin_sitestats.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 61,65 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query SiteStats config table", "", __LINE__, __FILE__, $sql ); } while ( $row = $db->sql_fetchrow( $result ) ) --- 61,65 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query SiteStats config table", "", __LINE__, __FILE__, $sql ); } while ( $row = $db->sql_fetchrow( $result ) ) *************** *** 75,79 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Failed to update SiteStats configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } --- 75,79 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Failed to update SiteStats configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } *************** *** 87,91 **** sprintf( $lang['SiteStats_Settings_return'], '<a href="' . append_sid( @basename( __FILE__ ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } --- 87,91 ---- sprintf( $lang['SiteStats_Settings_return'], '<a href="' . append_sid( @basename( __FILE__ ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } Index: admin_counter.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/admin/admin_counter.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_counter.php 15 Oct 2005 22:18:28 -0000 1.1 --- admin_counter.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 101,105 **** if ( !$sitestats_counter->updateCounter() ) { ! message_die( GENERAL_ERROR, "Couldn't update SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } --- 101,105 ---- if ( !$sitestats_counter->updateCounter() ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } *************** *** 111,115 **** if ( !$sitestats_counter->deleteCounter() ) { ! message_die( GENERAL_ERROR, "Couldn't delete SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } --- 111,115 ---- if ( !$sitestats_counter->deleteCounter() ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } *************** *** 125,129 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't read counter data", "", __LINE__, __FILE__, $sql ); } $rs_counter = $db->sql_fetchrowset( $result ); --- 125,129 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't read counter data", "", __LINE__, __FILE__, $sql ); } $rs_counter = $db->sql_fetchrowset( $result ); *************** *** 187,191 **** $message = '<br />' . ( empty( $errmsg ) ? ' ' : '<div style="width:80%; padding:10px; border:solid red 1px;">' . $errmsg . '</div>' ) . '<br />' . '<script>function doOnLoad() {document.forms[0].elements[0].focus();} window.onload=doOnLoad;</script>' . '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>' . '<input type="text" name="pg" size="100" value="' . $mypg . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>' . '<input type="text" name="ch" size="100" value="' . $mych . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>' . '<input type="text" name="cs" size="100" value="' . $mycs . '" class="post" /></td></tr>' . '</table> <br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['Cancel'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Submit'] . '" class="liteoption" />' . '</form>'; ! message_die( GENERAL_MESSAGE, $message, $my_script_title ); } --- 187,191 ---- $message = '<br />' . ( empty( $errmsg ) ? ' ' : '<div style="width:80%; padding:10px; border:solid red 1px;">' . $errmsg . '</div>' ) . '<br />' . '<script>function doOnLoad() {document.forms[0].elements[0].focus();} window.onload=doOnLoad;</script>' . '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>' . '<input type="text" name="pg" size="100" value="' . $mypg . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>' . '<input type="text" name="ch" size="100" value="' . $mych . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>' . '<input type="text" name="cs" size="100" value="' . $mycs . '" class="post" /></td></tr>' . '</table> <br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['Cancel'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Submit'] . '" class="liteoption" />' . '</form>'; ! mx_message_die( GENERAL_MESSAGE, $message, $my_script_title ); } *************** *** 201,205 **** $message = '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . '<tr><td><b>' . $lang['SiteStats_Counter_id'] . ':</b> </td><td>[ ' . $myid . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . $mych . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . $mycs . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid red 1px;">' . $lang['Confirm_delete_counter'] . '<br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['No'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Yes'] . '" class="liteoption" />' . '</div><br /> ' . '</form>'; ! message_die( GENERAL_MESSAGE, $message, $my_script_title ); } --- 201,205 ---- $message = '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . '<tr><td><b>' . $lang['SiteStats_Counter_id'] . ':</b> </td><td>[ ' . $myid . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . $mych . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . $mycs . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid red 1px;">' . $lang['Confirm_delete_counter'] . '<br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['No'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Yes'] . '" class="liteoption" />' . '</div><br /> ' . '</form>'; ! mx_message_die( GENERAL_MESSAGE, $message, $my_script_title ); } *************** *** 218,222 **** $message = '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . intval( $mych ) . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . intval( $mycs ) . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid blue 1px;">' . $lang['Counter_Config_updated'] . '<br /> <br />' . sprintf( $lang['Click_return_Counter_admin'], '<a href="' . append_sid( $my_script_name ) . '">', '</a>' ) . '</div><br /> '; ! message_die( GENERAL_MESSAGE, $message, $my_script_title ); } --- 218,222 ---- $message = '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . intval( $mych ) . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . intval( $mycs ) . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid blue 1px;">' . $lang['Counter_Config_updated'] . '<br /> <br />' . sprintf( $lang['Click_return_Counter_admin'], '<a href="' . append_sid( $my_script_name ) . '">', '</a>' ) . '</div><br /> '; ! mx_message_die( GENERAL_MESSAGE, $message, $my_script_title ); } |