[Easymod-cvs] easymod/install/em_files/includes/em em_functions.php,1.1,1.2 em_functions_20x.php,1.1
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
[Easymod-cvs] easymod/install/em_files/includes/em em_functions.php,1.1,1.2 em_functions_20x.php,1.1,1.2 em_functions_30x.php,1.1,1.2 em_parser_xml.php,1.2,1.3
|
From: Eric F. <wg...@us...> - 2005-12-22 00:33:46
|
Update of /cvsroot/easymod/easymod/install/em_files/includes/em In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28502/em_files/includes/em Modified Files: em_functions.php em_functions_20x.php em_functions_30x.php em_parser_xml.php Log Message: - Changed error message to em_trigger_error Other minor changes Index: em_functions_30x.php =================================================================== RCS file: /cvsroot/easymod/easymod/install/em_files/includes/em/em_functions_30x.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** em_functions_30x.php 4 Dec 2005 03:12:30 -0000 1.1 --- em_functions_30x.php 22 Dec 2005 00:33:31 -0000 1.2 *************** *** 1,4 **** <?php ! /** * * @package EasyMOD --- 1,4 ---- <?php ! /** * * @package EasyMOD *************** *** 23,31 **** } - function em_trigger_error($msg_text = '', $msg_code = 0, $msg_title = '', $err_line = '', $err_file = '', $sql = '') - { - trigger_error($msg_text); - } - function em_auth() { --- 23,26 ---- Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod/install/em_files/includes/em/em_functions.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** em_functions.php 4 Dec 2005 03:12:30 -0000 1.1 --- em_functions.php 22 Dec 2005 00:33:31 -0000 1.2 *************** *** 83,87 **** if ( !$db->sql_query($sql) ) { ! em_handle_error(EM_ERR_CRITICAL,'err_update_ext', array($sql, __LINE__, __FILE__)); } --- 83,87 ---- if ( !$db->sql_query($sql) ) { ! em_trigger_error(EM_ERR_CRITICAL,'err_update_ext', array($sql, __LINE__, __FILE__)); } *************** *** 149,153 **** if ( $result !== true ) { ! em_handle_error(EM_ERR_CRITICAL,$result); } } --- 149,153 ---- if ( $result !== true ) { ! em_trigger_error(EM_ERR_CRITICAL,$result); } } *************** *** 424,428 **** * Displays EasyMOD errors */ ! function em_handle_error($err_type, $msg_text) { global $lang; --- 424,428 ---- * Displays EasyMOD errors */ ! function em_trigger_error($err_type, $msg_text) { global $lang; Index: em_parser_xml.php =================================================================== RCS file: /cvsroot/easymod/easymod/install/em_files/includes/em/em_parser_xml.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** em_parser_xml.php 22 Dec 2005 00:14:43 -0000 1.2 --- em_parser_xml.php 22 Dec 2005 00:33:31 -0000 1.3 *************** *** 39,49 **** */ var $header = array(); ! /** * Actions for the MOD * @type array */ ! var $actions = array(); ! /** * Parsed XML file in an array --- 39,49 ---- */ var $header = array(); ! /** * Actions for the MOD * @type array */ ! var $actions = array(); ! /** * Parsed XML file in an array *************** *** 51,55 **** */ var $data = array(); ! /** * XML parser resource --- 51,55 ---- */ var $data = array(); ! /** * XML parser resource *************** *** 68,72 **** $this->mod_file = $mod_file; } ! function _parse() { --- 68,72 ---- $this->mod_file = $mod_file; } ! function _parse() { *************** *** 139,143 **** $this->header['version'] = trim($version_info['MAJOR'][0]['data']) . '.' . trim($version_info['MINOR'][0]['data']) . '.' . trim($version_info['REVISION']['data']); $this->header['version'] = (isset($version_info['RELEASE'][0]['data'])) ? $this->header['version'] . $version_info['RELEASE'][0]['data'] : $this->header['version']; ! $author_info = $header_info['AUTHOR-GROUP'][0]['children']['AUTHOR']; for($i = 0, $total = sizeof($author_info); $i < $total; $i++) --- 139,143 ---- $this->header['version'] = trim($version_info['MAJOR'][0]['data']) . '.' . trim($version_info['MINOR'][0]['data']) . '.' . trim($version_info['REVISION']['data']); $this->header['version'] = (isset($version_info['RELEASE'][0]['data'])) ? $this->header['version'] . $version_info['RELEASE'][0]['data'] : $this->header['version']; ! $author_info = $header_info['AUTHOR-GROUP'][0]['children']['AUTHOR']; for($i = 0, $total = sizeof($author_info); $i < $total; $i++) *************** *** 149,153 **** 'website' => trim($author_info[$i]['children']['HOMEPAGE'][0]['data'])); } ! return $this->header; } --- 149,153 ---- 'website' => trim($author_info[$i]['children']['HOMEPAGE'][0]['data'])); } ! return $this->header; } *************** *** 158,169 **** // sql ! $sql_info = $actions['SQL']; for( $i = 0, $total = sizeof($sql_info); $i < $total; $i++ ) { $this->actions['sql'][] = ( !empty($sql_info[$i]['data']) ) ? trim($sql_info[$i]['data']): ''; } ! // copy ! $copy_info = $actions['COPY']; for( $i = 0, $total = sizeof($copy_info); $i < $total; $i++ ) { --- 158,169 ---- // sql ! $sql_info = ( !empty($actions['SQL']) ) ? $actions['SQL'] : ''; for( $i = 0, $total = sizeof($sql_info); $i < $total; $i++ ) { $this->actions['sql'][] = ( !empty($sql_info[$i]['data']) ) ? trim($sql_info[$i]['data']): ''; } ! // copy ! $copy_info = ( !empty($actions['COPY']) ) ? $actions['COPY'] : array(); for( $i = 0, $total = sizeof($copy_info); $i < $total; $i++ ) { *************** *** 176,194 **** } } ! // open ! $open_info = $actions['OPEN']; for( $i = 0, $total = sizeof($open_info); $i < $total; $i++ ) { $current_file = str_replace('\\', '/', trim($open_info[$i]['attrs']['SRC'])); $this->actions['open'][$current_file] = array(); ! ! $edit_info = $open_info[$i]['children']['EDIT']; for($j = 0, $edit_total = sizeof($edit_info); $j < $edit_total; $j++) { ! $action_info = $edit_info[$j]['children']; $this->actions['open'][$current_file]['edit'][$j]['find'] = $action_info['FIND'][0]['data']; ! ! $actions = $action_info['ACTION']; for($k = 0, $action_total = sizeof($actions); $k < $action_total; $k++) { --- 176,194 ---- } } ! // open ! $open_info = ( !empty($actions['OPEN']) ) ? $actions['OPEN'] : array();; for( $i = 0, $total = sizeof($open_info); $i < $total; $i++ ) { $current_file = str_replace('\\', '/', trim($open_info[$i]['attrs']['SRC'])); $this->actions['open'][$current_file] = array(); ! ! $edit_info = ( !empty($open_info[$i]['children']['EDIT']) ) ? $open_info[$i]['children']['EDIT'] : array(); for($j = 0, $edit_total = sizeof($edit_info); $j < $edit_total; $j++) { ! $action_info = ( !empty($edit_info[$j]['children']) ) ? $edit_info[$j]['children'] : array(); $this->actions['open'][$current_file]['edit'][$j]['find'] = $action_info['FIND'][0]['data']; ! ! $actions = ( !empty($action_info['ACTION']) ) ? $action_info['ACTION'] : array(); for($k = 0, $action_total = sizeof($actions); $k < $action_total; $k++) { *************** *** 200,211 **** } ! $inline_info = $action_info['INLINE-EDIT']; for($k = 0, $inline_total = sizeof($inline_info); $k < $inline_total; $k++) { ! $inline_actions = $inline_info[$k]['children']; ! $this->actions['open'][$current_file]['edit'][$j]['in-line-edit'][$k]['in-line-find'] = $inline_actions['INLINE-FIND'][0]['data']; ! ! $actions = $inline_actions['INLINE-ACTION']; for($x = 0, $actions_total = sizeof($actions); $x < $actions_total; $x++) { --- 200,211 ---- } ! $inline_info = ( !empty($action_info['INLINE-EDIT']) ) ? $action_info['INLINE-EDIT'] : array(); for($k = 0, $inline_total = sizeof($inline_info); $k < $inline_total; $k++) { ! $inline_actions = ( !empty($inline_info[$k]['children']) ) ? $inline_info[$k]['children'] : array(); ! $this->actions['open'][$current_file]['edit'][$j]['in-line-edit'][$k]['in-line-find'] = $inline_actions['INLINE-FIND'][0]['data']; ! ! $actions = ( !empty($inline_actions['INLINE-ACTION']) ) ? $inline_actions['INLINE-ACTION'] : array(); for($x = 0, $actions_total = sizeof($actions); $x < $actions_total; $x++) { Index: em_functions_20x.php =================================================================== RCS file: /cvsroot/easymod/easymod/install/em_files/includes/em/em_functions_20x.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** em_functions_20x.php 4 Dec 2005 03:12:30 -0000 1.1 --- em_functions_20x.php 22 Dec 2005 00:33:31 -0000 1.2 *************** *** 135,143 **** } - function em_trigger_error($msg_text = '', $msg_code = 0, $msg_title = '', $err_line = '', $err_file = '', $sql = '') - { - message_die($msg_code, $msg_text, $msg_title, $err_line, $err_file, $sql); - } - function em_auth() { --- 135,138 ---- |
