[Easymod-cvs] easymod2/mods/easymod/em_includes em_cipher.php,1.2,1.3 em_ftp.php,1.2,1.3 em_function
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
[Easymod-cvs] easymod2/mods/easymod/em_includes em_cipher.php,1.2,1.3 em_ftp.php,1.2,1.3 em_functions.php,1.5,1.6 em_modio.php,1.3,1.4 em_schema.php,1.6,1.7 emver.php,1.1,NONE
|
From: Eric F. <wg...@us...> - 2005-06-11 23:06:09
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5948/mods/easymod/em_includes Modified Files: em_cipher.php em_ftp.php em_functions.php em_modio.php em_schema.php Removed Files: emver.php Log Message: - Changed copyright - Change <br> to <br /> - Removed some more hardcoded text - Removed the password and version change files - Other minor changes Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** em_ftp.php 1 May 2005 07:21:14 -0000 1.2 --- em_ftp.php 11 Jun 2005 23:05:53 -0000 1.3 *************** *** 4,9 **** * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002-2004 Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002-2004 Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 45,55 **** { // failed to connect! ! echo "<br>\n" ; ! echo '<b>' . sprintf($lang['EM_ftp_fail_conn'], $ftp_host, $ftp_port) . "</b><br>\n" ; // they may need to specify the host if ($ftp_host == 'localhost') { ! echo $lang['EM_ftp_fail_conn_lh'] . "<br>\n" ; } --- 45,55 ---- { // failed to connect! ! echo "<br />\n" ; ! echo '<b>' . sprintf($lang['EM_ftp_fail_conn'], $ftp_host, $ftp_port) . "</b><br />\n" ; // they may need to specify the host if ($ftp_host == 'localhost') { ! echo $lang['EM_ftp_fail_conn_lh'] . "<br />\n" ; } *************** *** 57,61 **** else if ($ftp_port == 21) { ! echo $lang['EM_ftp_fail_conn_21'] . "<br>\n"; } --- 57,61 ---- else if ($ftp_port == 21) { ! echo $lang['EM_ftp_fail_conn_21'] . "<br />\n"; } *************** *** 66,71 **** if ((strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':'))) { ! echo $lang['EM_ftp_fail_conn_invalid'] . "<br>\n" ; ! echo "<br>\n" ; } --- 66,71 ---- if ((strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':'))) { ! echo $lang['EM_ftp_fail_conn_invalid'] . "<br />\n" ; ! echo "<br />\n" ; } *************** *** 73,86 **** else if (intval($ftp_port) == $ftp_port) { ! echo $lang['EM_ftp_fail_conn_invalid2'] . "<br>\n"; ! echo "<br>\n"; } // give them options ! echo $lang['EM_fail_conn_info'] . "<br><ol>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op1'] . "\n" ; ! echo '<li>' . $lang['EM_fail_conn_op2'] . "\n" ; ! echo '<li>' . $lang['EM_fail_conn_op3'] . "\n" ; ! echo '<li>' . $lang['EM_fail_conn_op4'] . "\n" ; echo "</ol>\n" ; } --- 73,86 ---- else if (intval($ftp_port) == $ftp_port) { ! echo $lang['EM_ftp_fail_conn_invalid2'] . "<br />\n"; ! echo "<br />\n"; } // give them options ! echo $lang['EM_fail_conn_info'] . "<br /><ol>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op1'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op2'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op3'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op4'] . "</li>\n" ; echo "</ol>\n" ; } *************** *** 96,104 **** $emftp->ftp_quit() ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_fail_login'] . "</b><br>" ; // give them options ! echo $lang['EM_fail_login_info'] . "<br><ol>\n" ; // check user/pass --- 96,104 ---- $emftp->ftp_quit() ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_fail_login'] . "</b><br />" ; // give them options ! echo $lang['EM_fail_login_info'] . "<br /><ol>\n" ; // check user/pass *************** *** 120,129 **** ! echo $lang['EM_test_ftp1']. "<br>\n" ; // if we are in debug mode, then get a dir listing before we start moving around if ($ftp_debug) { ! echo '<b>PWD:</b> ' . $emftp->ftp_pwd() . "<br>\n"; ////// --- 120,129 ---- ! echo $lang['EM_test_ftp1']. "<br />\n" ; // if we are in debug mode, then get a dir listing before we start moving around if ($ftp_debug) { ! echo '<b>PWD:</b> ' . $emftp->ftp_pwd() . "<br />\n"; ////// *************** *** 132,139 **** $list = $emftp->ftp_nlist(); ! echo '<b>Dir listing:</b> (' . count($list) . " files being listed)<br>\n"; for ($i=0; $i<count($list); $i++) { ! echo '[' . $list[$i] . "]<br>\n" ; } } --- 132,139 ---- $list = $emftp->ftp_nlist(); ! echo '<b>Dir listing:</b> (' . count($list) . " files being listed)<br />\n"; for ($i=0; $i<count($list); $i++) { ! echo '[' . $list[$i] . "]<br />\n" ; } } *************** *** 142,154 **** if (!$pwd = $emftp->ftp_chdir( $ftp_dir . '/admin/mods/easymod')) { ! echo "<br>\n" ; ! echo '<b>' . sprintf($lang['EM_fail_cd'], $ftp_dir) . "</b><br>\n" ; ! echo $lang['EM_fail_cd_info'] . "<br><ol><br>\n" ; // some dopes put the ftp server in the paths if ((strstr($ftp_dir, '.com')) || (strstr($ftp_dir, '.net')) || (strstr($ftp_dir, '.org'))) { ! echo '<li>' . $lang['EM_fail_cd_op1'] . "\n" ; } --- 142,154 ---- if (!$pwd = $emftp->ftp_chdir( $ftp_dir . '/admin/mods/easymod')) { ! echo "<br />\n" ; ! echo '<b>' . sprintf($lang['EM_fail_cd'], $ftp_dir) . "</b><br />\n" ; ! echo $lang['EM_fail_cd_info'] . "<br /><ol><br />\n" ; // some dopes put the ftp server in the paths if ((strstr($ftp_dir, '.com')) || (strstr($ftp_dir, '.net')) || (strstr($ftp_dir, '.org'))) { ! echo '<li>' . $lang['EM_fail_cd_op1'] . "</li>\n" ; } *************** *** 156,172 **** if (substr($ftp_dir, strlen($ftp_dir)-1) == '/') { ! echo '<li>' . $lang['EM_fail_cd_op2'] . "\n" ; } // everything else ! echo '<li>' . $lang['EM_fail_cd_op3'] . "\n" ; ! echo '<li>' . $lang['EM_fail_cd_op4'] . "\n" ; if ($ftp_host == 'localhost' || $ftp_port == 21) { ! echo '<li>' . $lang['EM_fail_cd_op5'] . "\n" ; } ! echo '<li>' . $lang['EM_fail_cd_op6'] . "\n" ; echo "</ol>\n" ; --- 156,172 ---- if (substr($ftp_dir, strlen($ftp_dir)-1) == '/') { ! echo '<li>' . $lang['EM_fail_cd_op2'] . "</li>\n" ; } // everything else ! echo '<li>' . $lang['EM_fail_cd_op3'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_cd_op4'] . "</li>\n" ; if ($ftp_host == 'localhost' || $ftp_port == 21) { ! echo '<li>' . $lang['EM_fail_cd_op5'] . "</li>\n" ; } ! echo '<li>' . $lang['EM_fail_cd_op6'] . "</li>\n" ; echo "</ol>\n" ; *************** *** 174,179 **** // print the working dir $emftp->set_debug( false) ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_ftp_root'] . "</b><br>\n" ; // if pwd fails then we know it is probably a passive mode problem if (!$emftp->ftp_pwd()) --- 174,179 ---- // print the working dir $emftp->set_debug( false) ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_ftp_root'] . "</b><br />\n" ; // if pwd fails then we know it is probably a passive mode problem if (!$emftp->ftp_pwd()) *************** *** 188,192 **** // print directory listing ! echo '<br><br><b>' . $lang['EM_dir_list'] . "<br>\n" ; $list = $emftp->ftp_nlist() ; --- 188,192 ---- // print directory listing ! echo '<br /><br /><b>' . $lang['EM_dir_list'] . "<br />\n" ; $list = $emftp->ftp_nlist() ; *************** *** 194,203 **** if (!$list) { ! echo $lang['EM_fail_cd_nlist'] . "<br>\n" ; } // if there are no files then indicate there are none to print else if (count($list) == 0) { ! echo '--' . $lang['EM_fail_cd_nlist_no'] . "--<br>\n" ; } else --- 194,203 ---- if (!$list) { ! echo $lang['EM_fail_cd_nlist'] . "<br />\n" ; } // if there are no files then indicate there are none to print else if (count($list) == 0) { ! echo '--' . $lang['EM_fail_cd_nlist_no'] . "--<br />\n" ; } else *************** *** 205,209 **** for ($i=0; $i<count($list); $i++) { ! echo $list[$i] . "<br>\n" ; } } --- 205,209 ---- for ($i=0; $i<count($list); $i++) { ! echo $list[$i] . "<br />\n" ; } } *************** *** 221,225 **** ! echo $lang['EM_test_ftp2'] . "<br>\n" ; --- 221,225 ---- ! echo $lang['EM_test_ftp2'] . "<br />\n" ; *************** *** 235,249 **** $emftp->ftp_quit(); ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_fail_put'] . "</b><br>" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br>\n" ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br>\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br>\n"; } closedir($dh); --- 235,249 ---- $emftp->ftp_quit(); ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_fail_put'] . "</b><br />" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br />\n" ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br />\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br />\n"; } closedir($dh); *************** *** 258,272 **** $emftp->ftp_quit(); ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_fail_reput'] . "</b><br>" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br>\n" ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br>\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br>\n"; } closedir($dh); --- 258,272 ---- $emftp->ftp_quit(); ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_fail_reput'] . "</b><br />" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br />\n" ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br />\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br />\n"; } closedir($dh); *************** *** 280,284 **** if (!$emftp->ftp_delete($remote_filename)) { ! echo $lang['EM_fail_delete'] . "<br>\n" ; } --- 280,284 ---- if (!$emftp->ftp_delete($remote_filename)) { ! echo $lang['EM_fail_delete'] . "<br />\n" ; } *************** *** 321,325 **** ! echo $lang['EM_test_ftp3']. "<br>\n" ; // disconnect --- 321,325 ---- ! echo $lang['EM_test_ftp3']. "<br />\n" ; // disconnect *************** *** 881,885 **** // htmlspecialchars and str_replace added by Nuttzy $message = htmlspecialchars($message) ; ! $message = str_replace( "\n", "<br>\n", $message) ; // hide the password added by Nuttzy --- 881,885 ---- // htmlspecialchars and str_replace added by Nuttzy $message = htmlspecialchars($message) ; ! $message = str_replace( "\n", "<br />\n", $message) ; // hide the password added by Nuttzy *************** *** 887,891 **** if ($words[1] == 'PASS') { ! $message = "> PASS ********<br>\n" ; } --- 887,891 ---- if ($words[1] == 'PASS') { ! $message = "> PASS ********<br />\n" ; } *************** *** 1188,1192 **** { // we failed; don't close the connection though, assume it will be cleaned up later ! $err_msg = 'ftp_mkdir_struct[1]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $script_path, $this->ftp_pwd()) ; return false ; --- 1188,1192 ---- { // we failed; don't close the connection though, assume it will be cleaned up later ! $err_msg = 'ftp_mkdir_struct[1]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $script_path, $this->ftp_pwd()) ; return false ; *************** *** 1219,1223 **** { // v0.0.10c, corrected err_msg to use prev_path instead of root_path - not tested! ! $err_msg = 'ftp_mkdir_struct[2]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; --- 1219,1223 ---- { // v0.0.10c, corrected err_msg to use prev_path instead of root_path - not tested! ! $err_msg = 'ftp_mkdir_struct[2]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1230,1234 **** if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct[3]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; --- 1230,1234 ---- if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct[3]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1260,1264 **** $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct[4]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; --- 1260,1264 ---- $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct[4]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; *************** *** 1298,1302 **** if (!$this->ftp_chdir( $prev_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[1]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; --- 1298,1302 ---- if (!$this->ftp_chdir( $prev_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[1]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1309,1313 **** if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[2]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; --- 1309,1313 ---- if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[2]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1340,1344 **** $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct_copy[3]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; --- 1340,1344 ---- $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct_copy[3]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; --- emver.php DELETED --- Index: em_schema.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_schema.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** em_schema.php 27 May 2005 08:10:50 -0000 1.6 --- em_schema.php 11 Jun 2005 23:05:53 -0000 1.7 *************** *** 4,9 **** * ------------------- * begin : Wednesday, May 16, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Wednesday, May 16, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 444,448 **** //$line = '[' . $ret_array['name'] . '][' . $ret_array['type'] . '][' . $ret_array['length'] . '][' . $ret_array['signed'] . '][' . $ret_array['null'] . '][' . $ret_array['default'] . '][' . $ret_array['def_val'] . '][' . $ret_array['increment'] . ']' ; ! //echo "$line<br><br>\n" ; return $ret_array ; --- 444,448 ---- //$line = '[' . $ret_array['name'] . '][' . $ret_array['type'] . '][' . $ret_array['length'] . '][' . $ret_array['signed'] . '][' . $ret_array['null'] . '][' . $ret_array['default'] . '][' . $ret_array['def_val'] . '][' . $ret_array['increment'] . ']' ; ! //echo "$line<br /><br />\n" ; return $ret_array ; *************** *** 1069,1073 **** $line = trim($sql[0]) ; $sql = array() ; ! $sql[] = "ABORTED: [$line]<br> Dropping a field in postgresql was not implemented. Contact Nuttzy if you know how to safely do this without having to drop the whole table." ; } --- 1069,1073 ---- $line = trim($sql[0]) ; $sql = array() ; ! $sql[] = "ABORTED: [$line]<br /> Dropping a field in postgresql was not implemented. Contact Nuttzy if you know how to safely do this without having to drop the whole table." ; } *************** *** 1271,1275 **** if ($error != '') { ! $error .= "<br><br>SQL Line:<br>$message" ; return ; } --- 1271,1275 ---- if ($error != '') { ! $error .= "<br /><br />SQL Line:<br />$message" ; return ; } Index: em_modio.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_modio.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** em_modio.php 9 May 2005 22:00:44 -0000 1.3 --- em_modio.php 11 Jun 2005 23:05:53 -0000 1.4 *************** *** 4,9 **** * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 250,254 **** error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[1]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_open_read'], $this->path . trim($this->filename)) ; return false ; --- 250,254 ---- error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[1]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_open_read'], $this->path . trim($this->filename)) ; return false ; *************** *** 294,298 **** error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[3]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_open_write'], $install_path . $process . $this->path . trim($this->filename). $ext); return false ; --- 294,298 ---- error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[3]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_open_write'], $install_path . $process . $this->path . trim($this->filename). $ext); return false ; *************** *** 404,408 **** // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[1]<br><br>$err_msg" : 'modio_close[1]->' . $this->err_msg . '<br><br><b>' . $lang['EM_err_secondary'] . '<b><br>' . $err_msg ; return false ; --- 404,408 ---- // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[1]<br /><br />$err_msg" : 'modio_close[1]->' . $this->err_msg . '<br /><br /><b>' . $lang['EM_err_secondary'] . '<b><br />' . $err_msg ; return false ; *************** *** 417,421 **** // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[2]<br><br>$err_msg" : 'modio_close[2]->' . $this->err_msg . '<br><br><b>' . $lang['EM_err_secondary'] . '<b><br>' . $err_msg ; return false ; --- 417,421 ---- // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[2]<br /><br />$err_msg" : 'modio_close[2]->' . $this->err_msg . '<br /><br /><b>' . $lang['EM_err_secondary'] . '<b><br />' . $err_msg ; return false ; *************** *** 431,435 **** // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[3]<br><br>$err_msg" : 'modio_close[3]->' . $this->err_msg . '<br><br><b>' . $lang['EM_err_secondary'] . '<b><br>' . $err_msg ; return false ; --- 431,435 ---- // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[3]<br /><br />$err_msg" : 'modio_close[3]->' . $this->err_msg . '<br /><br /><b>' . $lang['EM_err_secondary'] . '<b><br />' . $err_msg ; return false ; *************** *** 469,473 **** if (!$this->emftp->ftp_connect( $this->ftp_host, $this->ftp_port)) { ! $this->err_msg = 'modio_prep[1]<br><br>' ; $this->err_msg .= $lang['EM_modio_prep_conn'] ; return false ; --- 469,473 ---- if (!$this->emftp->ftp_connect( $this->ftp_host, $this->ftp_port)) { ! $this->err_msg = 'modio_prep[1]<br /><br />' ; $this->err_msg .= $lang['EM_modio_prep_conn'] ; return false ; *************** *** 477,481 **** $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[2]<br><br>' ; $this->err_msg .= $lang['EM_modio_prep_login'] ; return false ; --- 477,481 ---- $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[2]<br /><br />' ; $this->err_msg .= $lang['EM_modio_prep_login'] ; return false ; *************** *** 487,491 **** $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[3]<br><br>' ; $this->err_msg .= $lang['EM_modio_prep_chdir'] ; return false ; --- 487,491 ---- $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[3]<br /><br />' ; $this->err_msg .= $lang['EM_modio_prep_chdir'] ; return false ; *************** *** 548,552 **** else { ! $this->err_msg = 'modio_move[1]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_move_copy'], $from, $to) ; return '' ; --- 548,552 ---- else { ! $this->err_msg = 'modio_move[1]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_move_copy'], $from, $to) ; return '' ; *************** *** 621,625 **** { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[2]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $to_dir, $this->emftp->ftp_pwd()) ; return '' ; --- 621,625 ---- { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[2]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $to_dir, $this->emftp->ftp_pwd()) ; return '' ; *************** *** 630,634 **** if (!$this->emftp->ftp_put( $to_file, $root . $from, $is_binary)) { ! $this->err_msg = 'modio_move[3]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_move_ftpa'], $from, $to_file) ; return '' ; --- 630,634 ---- if (!$this->emftp->ftp_put( $to_file, $root . $from, $is_binary)) { ! $this->err_msg = 'modio_move[3]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_move_ftpa'], $from, $to_file) ; return '' ; *************** *** 643,647 **** { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[4]<br><br>' ; $this->err_msg = sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->emftp->ftp_pwd()) ; return '' ; --- 643,647 ---- { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[4]<br /><br />' ; $this->err_msg = sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->emftp->ftp_pwd()) ; return '' ; Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** em_functions.php 8 Jun 2005 03:12:20 -0000 1.5 --- em_functions.php 11 Jun 2005 23:05:53 -0000 1.6 *************** *** 4,9 **** * ------------------- * begin : Sunday, Mar 31, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Sunday, Mar 31, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 152,156 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[1]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; --- 152,156 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[1]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; *************** *** 161,165 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[2]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } --- 161,165 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[2]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } *************** *** 194,198 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[3]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; --- 194,198 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[3]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; *************** *** 206,210 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[4]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } --- 206,210 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[4]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } *************** *** 235,239 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[5]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; --- 235,239 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[5]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; *************** *** 347,351 **** { //warning: tmp is throwing undefined ! //echo "in here<br>\n" ; // $temp_array[] = $tmp ; $potential_find[count($potential_find)-1]['trailing_whitespace']++ ; --- 347,351 ---- { //warning: tmp is throwing undefined ! //echo "in here<br />\n" ; // $temp_array[] = $tmp ; $potential_find[count($potential_find)-1]['trailing_whitespace']++ ; *************** *** 469,473 **** if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 469,473 ---- if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 476,480 **** else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 476,480 ---- else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 483,487 **** else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 483,487 ---- else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 490,494 **** else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 490,494 ---- else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 497,506 **** else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } // now that we have the error level, append the fail message to it ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_find_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ":<br><br>\n" ; --- 497,506 ---- else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } // now that we have the error level, append the fail message to it ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_find_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ":<br /><br />\n" ; *************** *** 508,512 **** for ($x=0; $x<count($search_array); $x++) { ! $file_list[$file_count]->err_msg .= htmlspecialchars($search_array[$x]) . "<br>\n" ; } --- 508,512 ---- for ($x=0; $x<count($search_array); $x++) { ! $file_list[$file_count]->err_msg .= htmlspecialchars($search_array[$x]) . "<br />\n" ; } *************** *** 611,615 **** if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 611,615 ---- if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 618,622 **** else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 618,622 ---- else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 625,629 **** else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 625,629 ---- else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 632,636 **** else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 632,636 ---- else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 639,646 **** else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_ifind_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ':<br><br>' . htmlspecialchars($search_fragment) . "<br>\n" ; --- 639,646 ---- else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_ifind_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ':<br /><br />' . htmlspecialchars($search_fragment) . "<br />\n" ; *************** *** 739,743 **** { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Sucessfully opened [lang_easymod.$phpEx] for reading, but did not find the expected string.<br> Found this instead: [" . htmlspecialchars($buffer) . "]" ; return false ; } --- 739,743 ---- { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Sucessfully opened [lang_easymod.$phpEx] for reading, but did not find the expected string.<br /> Found this instead: [" . htmlspecialchars($buffer) . "]" ; return false ; } *************** *** 1048,1053 **** ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_insert'], $config_name) . "<br>\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br>\n" ; // Debugging $sql_error = $db->sql_error(); --- 1048,1053 ---- ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_insert'], $config_name) . "<br />\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br />\n" ; // Debugging $sql_error = $db->sql_error(); *************** *** 1072,1077 **** ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_update'], $config_name) . "<br>\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br>\n" ; // Debugging $sql_error = $db->sql_error(); --- 1072,1077 ---- ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_update'], $config_name) . "<br />\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br />\n" ; // Debugging $sql_error = $db->sql_error(); *************** *** 1192,1196 **** ! //echo "zzzzzzzzzz [$install_path][$file_path][$file_name]<br>\n" ; // check for wild cards if ( strstr( $file_name, '*') || strstr( $file_name, '?') ) --- 1192,1196 ---- ! //echo "zzzzzzzzzz [$install_path][$file_path][$file_name]<br />\n" ; // check for wild cards if ( strstr( $file_name, '*') || strstr( $file_name, '?') ) *************** *** 1202,1206 **** else if ( is_dir( $install_path . $file_path . '/' . $file_name) ) { ! //echo "x<br>\n" ; // if the whole thing is a directory, then it is a path and make the filename *.* // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; --- 1202,1206 ---- else if ( is_dir( $install_path . $file_path . '/' . $file_name) ) { ! //echo "x<br />\n" ; // if the whole thing is a directory, then it is a path and make the filename *.* // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; *************** *** 1212,1216 **** else if ( $file[ (strlen($file)-1)] == '/') { ! //echo "y<br>\n" ; // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; // return array( 'path' => $file_path . $file_name, 'file' => '*.*') ; --- 1212,1216 ---- else if ( $file[ (strlen($file)-1)] == '/') { ! //echo "y<br />\n" ; // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; // return array( 'path' => $file_path . $file_name, 'file' => '*.*') ; Index: em_cipher.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_cipher.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** em_cipher.php 22 May 2005 00:29:37 -0000 1.2 --- em_cipher.php 11 Jun 2005 23:05:53 -0000 1.3 *************** *** 4,9 **** * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ |
