mt-admin Commit - c3da001f5ff1

Fix calls to mysqli_error().

darkmorford -

c3da001f5ff1

Not Reviewed

Context file:

Add another comment

Collapse all files

0 unresolved 0 Resolved

0 General 0 Inline

include/cookies.php ¶ +2 -2

             	define('USER_COOKIE', 'megatokyoadmin_user_'. COOKIEHASH);
             if ( !defined('PASS_COOKIE') )
             	define('PASS_COOKIE', 'megatokyoadmin_pass_'. COOKIEHASH);
             if ( !defined('COOKIEPATH') )
             	define('COOKIEPATH', ADMIN_PATH . '/' );
             if ( !defined('COOKIE_DOMAIN') )
             	setcookie(PASS_COOKIE, ' ', time() - 36000, COOKIEPATH );
             }
-            ?>
  No newline at end of file
+            ?>

include/error.php ¶ +1 -1

             	$sql = sprintf('INSERT INTO admin_log (contributor, section, action, level, message) VALUES (%s, %d, "%s", %d, "%s")',
             	               (is_numeric($currentuser->id) ? $currentuser->id : "NULL"), $section, mysqli_real_escape_string($mtdb->link, $action), $level, mysqli_real_escape_string($mtdb->link, $msg));
-            	$mtdb->query( $sql ) or die($sql."<br>".mysqli_error()."<br>\n".var_export(debug_backtrace()));
+            	$mtdb->query( $sql ) or die($sql."<br>".mysqli_error($mtdb->link)."<br>\n".var_export(debug_backtrace()));
             	// Log all important sorts of messages in the Apache log
             	if( $level & (E_USER_WARNING | E_USER_ERROR) ) {

include/extra.php ¶ +11 -11

             function extra_handle_upload() {
             	global $info,$error,$dir;
             	if( !$_FILES['extra_file'] ) return false;
             	if( '' == $_FILES['extra_file']['name'] ) return false;
             	if( UPLOAD_ERR_NO_FILE == $_FILES['extra_file']['error'] ) return false;
             	if( 0 == $_FILES['extra_file']['size'] ) return false;
             	if(isset( $_POST['name'] )) $dest = $_POST['name'];
             	$dest = extra_sanitize_filename($dest);
             	if( !is_uploaded_file( $_FILES['extra_file']['tmp_name'] )) return false;
             	if( move_uploaded_file($_FILES['extra_file']['tmp_name'], $dir.'/'.$dest) ) return $true;
             	return false;
             }
             function extra_get_directory_list($dir) {
             	if( !is_dir( $dir ) ) return false;
             	if( ! $handle = opendir( $dir ) ) return false;
             	$files = array();
             	class ExtraFile {
             		var $name;
             		var $rwx;
             		var $mtime;
             		var $inode;
             		function ExtraFile($path, $file) {
             			$this->name = $file;
             			$this->fullpath = $path . $file;
             			$this->mtime = filemtime($this->fullpath);
             			$this->inode = fileinode($this->fullpath);
             		}
             	}
             	while (false !== ($file = readdir($handle))) {
             		if( is_file( $dir.'/'.$file )) $files[] = new ExtraFile($dir.'/', $file);
             	}
             	return $files;
             }
-            ?>
  No newline at end of file
+            ?>

include/functions.php ¶ +4 -4

             	$url = str_replace($strip, '', $url);
             	if ( strpos($url, '://') === false && substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9-]+?\.php/i', $url) )
             		$url = 'http://' . $url;
             	$url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
             	return $url;
             }
             // Like htmlspecialchars except don't double-encode HTML entities
             function mt_specialchars( $text, $quotes = false ) {
             	$text = str_replace('&&', '&#038;&', $text);
             	$text = str_replace('&&', '&#038;&', $text);
             	$text = preg_replace('/&(?:$|([^#])(?![a-z1-4]{1,8};))/', '&#038;$1', $text);
             function check_type_name( $name ) {
             	global $error;
             	if( $name == '' )
             		$error.='A type must be supplied with a name, but none was given. Valid characters include letters, numbers, apostrophes, colons, and whitespace.';
             	elseif ( $name !== sanitize_type_name($name) )
             	return false;
             }
-            ?>
  No newline at end of file
+            ?>

include/images.php ¶ +5 -5

             {
             	$img_data = getimagesize($filename);
             	$ext = image_type_to_extension($img_data[2]);
             	switch($ext)
             	{
             		case '.gif':
             		return false;
             	}
             	$dest = imagecreatetruecolor(300, 245);
             	#attempt to determine scaling factor
             	$data = getimagesize($filename);
             	#300x245 reduces to 60x49
             	$factor = min(floor($data[0]/60), floor($data[1]/49));
             	#well, that should give us a good scaling factor
             	#now we have to determine what point to start from
             	$src_x = floor(($data[0]/2) - ($factor*30));
             	$src_y = floor(($data[1]/2) - ($factor*24.5));
             	#make sure we don't fuck things up
             	if($src_x < 0) $src_x=0;
             	if($src_y < 0) $src_y=0;
             	#now resample
             	imagecopyresampled($dest, $source, 0, 0, $src_x, $src_y, 300, 245, $factor*60, $factor*49);
             	#and output

include/mysql.php ¶ +2 -2

             	function query($sql, $showerror = true ) {
             		$r = mysqli_query( $this->link, $sql );
-            		if( false === $r && $showerror ) echo mysqli_error();
+            		if( false === $r && $showerror ) echo mysqli_error($this->link);
             		return $r;
             	}
             	function getRow($sql) {
             		if( $r = $this->query( $sql ) ) {
             			if( false === $r ) {
-            				echo mysqli_error();
+            				echo mysqli_error($this->link);
             				return false;
             			}
             			if( mysqli_num_rows( $r ) == 0 ) return false;

include/nonce.php ¶ +12 -12

             	global $mtdb;
             	$c = explode('-',$action);
             	$i = (int)$c[2];
             	$message = array();
             	$message['rant']['new'] = 'Are you sure you want to create a new rant?';
             	$message['rant']['save'] = 'Are you sure you want to save changes to the rant "%s"?';
             	$message['rant']['delete'] = 'Are you sure you want to delete the rant "%s"? This is a destructive action, and cannot be undone!';
             	$message['type']['new'] = 'Are you sure you want to create a new type?';
             	$message['type']['save'] = 'Are you sure you want to save changes to the type "%s"?';
             	$message['type']['delete'] = 'Are you sure you want to delete the type "%s"? This is a destructive action, and cannot be undone!';
             	$message['metatype']['new'] = 'Are you sure you want to create a new metatype?';
             	$message['metatype']['save'] = 'Are you sure you want to save changes to the metatype "%s"?';
             	$message['metatype']['delete'] = 'Are you sure you want to delete the metatype "%s"? This is a destructive action, and cannot be undone!';
             	$message['strip']['save'] = 'Are you sure you want to save changes to the strip "%s"?';
             	$message['strip']['delete'] = 'Are you sure you want to delete the comic strip "%1$s"? This will break site navigation, which can be fixed by changing other strip numbers. This is a destructive action, and cannot be undone! It is far better to <a href="edit-comic.php?strip_id=%1$s">edit the existing strip</a>.';
             	$message['strip']['swap'] = 'Are you sure you want to swap these two strips? This is a destructive action, and cannot be undone!';
             	$message['statusbox']['update'] = 'Are you sure you want to update the statusbox information?';
             	$message['scratchpad']['new'] = 'Are you sure you want to update the scratchpad information?';
             	$message['twitter']['new'] = 'Are you sure you want to update the Twitter feed?';
             	$message['extra']['new'] = 'Are you sure you want to upload a new file to /extra?';
             	$message['extra']['delete'] = 'Are you sure you want to delete the file from /extra named "%s"?';
             	$message['twitteruser']['delete'] = 'Are you sure you want to delete the twitter user "%s"?';
             	if( isset( $message[ $c[1] ][ $c[0] ] )) {
             		$t = $message[ $c[1] ][ $c[0] ];
             		if( false !== strpos( $t, '%' ) ) {
             			switch( $c[1] ) {
             				case 'rant':	$v = $mtdb->getOne('SELECT title FROM rant WHERE id=' . $i); break;
             				case 'strip':	$v = $mtdb->getOne('SELECT id FROM strip WHERE id=' . $i); break;
             				case 'twitteruser': $v = $mtdb->getOne('SELECT username FROM twitter_user WHERE id=' . $i); break;
             				default:		$v = $i;
             			}
             			return sprintf( $t, mt_specialchars($v,true) );
             		}
             		return $t;
             	}
             	return "Are you sure you want to perform the action $action?";
             }
             	echo '<input type="hidden" name="_mtnonce" value="' . create_nonce($action) . '" />';
             }
-            ?>
  No newline at end of file
+            ?>

include/transcript.php ¶ +3 -3

             					if( $insert_sql && false === $mtdb->query( $insert_sql ) ) {
             						$mtdb->query('ROLLBACK');
-            						mtdie (mysqli_error(), 'Error inserting transcript.');
+            						mtdie (mysqli_error($mtdb->link), 'Error inserting transcript.');
             					}
             				}
             					$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, mysqli_real_escape_string($mtdb->link, $speaker), '', '');
             					if( false === $mtdb->query( $insert_sql ) ) {
             						$mtdb->query('ROLLBACK');
-            						mtdie (mysqli_error(), 'Error inserting transcript.');
+            						mtdie (mysqli_error($mtdb->link), 'Error inserting transcript.');
             					}
             				}
             			}
             							mysqli_real_escape_string($mtdb->link, $spoken[1]), mysqli_real_escape_string($mtdb->link, $spoken[2]) );
             					if( false === $mtdb->query( $insert_sql ) ) {
             						$mtdb->query('ROLLBACK');
-            						mtdie (mysqli_error(), 'Error inserting transcript.');
+            						mtdie (mysqli_error($mtdb->link), 'Error inserting transcript.');
             					}
             				}
             			}

include/type.php ¶ +2 -2

             	global $mtdb;
             	$id = (int)$id;
             	$r = $mtdb->getRow( 'SELECT id, name, description FROM strip_t WHERE id=' . $id );
             	$r->meta = $mtdb->getAll( 'SELECT meta as id from meta where type=' . $id);
             	return $r;
             }
             	return $obj->name;
             }
-            ?>
  No newline at end of file
+            ?>

Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings