GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Siebrand Mazeland 2009-11-08 23:33:58 +01:00
commit b10f362ede
75 changed files with 7718 additions and 4851 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/all.php
View File

@ -129,7 +129,7 @@ class AllAction extends ProfileAction
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user(); $current_user = common_current_user();
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message .= _('Try subscribing to more users, [join a group](%%action.groups%%) or post something yourself.'); $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
} else { } else {
$message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
} }

4
actions/emailsettings.php
View File

@ -452,7 +452,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$user->updateKeys($orig)) { if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__); common_log_db_error($user, 'UPDATE', __FILE__);
$this->serverError(_("Could not update user record.")); $this->serverError(_("Couldn't update user record."));
} }
$this->showForm(_('Incoming email address removed.'), true); $this->showForm(_('Incoming email address removed.'), true);
@ -474,7 +474,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$user->updateKeys($orig)) { if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__); common_log_db_error($user, 'UPDATE', __FILE__);
$this->serverError(_("Could not update user record.")); $this->serverError(_("Couldn't update user record."));
} }
$this->showForm(_('New incoming email address added.'), true); $this->showForm(_('New incoming email address added.'), true);

4
actions/foaf.php
View File

@ -136,7 +136,7 @@ class FoafAction extends Action
$person = $this->showMicrobloggingAccount($this->profile, $person = $this->showMicrobloggingAccount($this->profile,
common_root_url(), $this->user->uri, false); common_root_url(), $this->user->uri, false);
// Get users who subscribe to user // Get people who subscribe to user
$sub = new Subscription(); $sub = new Subscription();
$sub->subscribed = $this->profile->id; $sub->subscribed = $this->profile->id;
@ -250,7 +250,7 @@ class FoafAction extends Action
if ($isSubscriber) { if ($isSubscriber) {
$this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct')); $this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
} else { } else {
// Get users user is subscribed to // Get people user is subscribed to
$sub = new Subscription(); $sub = new Subscription();
$sub->subscriber = $profile->id; $sub->subscriber = $profile->id;
$sub->whereAdd('subscriber != subscribed'); $sub->whereAdd('subscriber != subscribed');

7
actions/groups.php
View File

@ -88,12 +88,11 @@ class GroupsAction extends Action
{ {
$notice = $notice =
sprintf(_('%%%%site.name%%%% groups let you find and talk with ' . sprintf(_('%%%%site.name%%%% groups let you find and talk with ' .
'users of similar interests. After you join a group ' . 'people of similar interests. After you join a group ' .
'you can send messages to all other members using the ' . 'you can send messages to all other members using the ' .
'syntax "!groupname". Are you not seeing any groups ' . 'syntax "!groupname". Don\'t see a group you like? Try ' .
'you like? Try ' .
'[searching for one](%%%%action.groupsearch%%%%) or ' . '[searching for one](%%%%action.groupsearch%%%%) or ' .
'[start your own](%%%%action.newgroup%%%%)!')); '[start your own!](%%%%action.newgroup%%%%)'));
$this->elementStart('div', 'instructions'); $this->elementStart('div', 'instructions');
$this->raw(common_markup_to_html($notice)); $this->raw(common_markup_to_html($notice));
$this->elementEnd('div'); $this->elementEnd('div');

8
actions/imsettings.php
View File

@ -69,7 +69,7 @@ class ImsettingsAction extends ConnectSettingsAction
{ {
return _('You can send and receive notices through '. return _('You can send and receive notices through '.
'Jabber/GTalk [instant messages](%%doc.im%%). '. 'Jabber/GTalk [instant messages](%%doc.im%%). '.
'Configure your instant messages address and settings below.'); 'Configure your address and settings below.');
} }
/** /**
@ -97,7 +97,7 @@ class ImsettingsAction extends ConnectSettingsAction
'action' => 'action' =>
common_local_url('imsettings'))); common_local_url('imsettings')));
$this->elementStart('fieldset', array('id' => 'settings_im_address')); $this->elementStart('fieldset', array('id' => 'settings_im_address'));
$this->element('legend', null, _('IM address')); $this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
if ($user->jabber) { if ($user->jabber) {
@ -111,7 +111,7 @@ class ImsettingsAction extends ConnectSettingsAction
if ($confirm) { if ($confirm) {
$this->element('p', 'form_unconfirmed', $confirm->address); $this->element('p', 'form_unconfirmed', $confirm->address);
$this->element('p', 'form_note', $this->element('p', 'form_note',
sprintf(_('Awaiting confirmation on this IM address. '. sprintf(_('Awaiting confirmation on this address. '.
'Check your Jabber/GTalk account for a '. 'Check your Jabber/GTalk account for a '.
'message with further instructions. '. 'message with further instructions. '.
'(Did you add %s to your buddy list?)'), '(Did you add %s to your buddy list?)'),
@ -151,7 +151,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->elementStart('li'); $this->elementStart('li');
$this->checkbox('jabberreplies', $this->checkbox('jabberreplies',
_('Send me replies through Jabber/GTalk '. _('Send me replies through Jabber/GTalk '.
'from users I am not subscribed to.'), 'from people I\'m not subscribed to.'),
$user->jabberreplies); $user->jabberreplies);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li'); $this->elementStart('li');

10
actions/invite.php
View File

@ -133,7 +133,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementEnd('ul'); $this->elementEnd('ul');
} }
if ($this->subbed) { if ($this->subbed) {
$this->element('p', null, _('These are already users and you were automatically subscribed to them:')); $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
$this->elementStart('ul'); $this->elementStart('ul');
foreach ($this->subbed as $other) { foreach ($this->subbed as $other) {
$this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
@ -141,7 +141,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementEnd('ul'); $this->elementEnd('ul');
} }
if ($this->sent) { if ($this->sent) {
$this->element('p', null, _('Invitation(s) sent to the following e-mail addresses:')); $this->element('p', null, _('Invitation(s) sent to the following people:'));
$this->elementStart('ul'); $this->elementStart('ul');
foreach ($this->sent as $other) { foreach ($this->sent as $other) {
$this->element('li', null, $other); $this->element('li', null, $other);
@ -226,9 +226,9 @@ class InviteAction extends CurrentUserDesignAction
$headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename); $headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename);
$body = sprintf(_("%1\$s has invited you to join them on %2\$s (%3\$s).\n\n". $body = sprintf(_("%1\$s has invited you to join them on %2\$s (%3\$s).\n\n".
"%2\$s is a micro-blogging service that lets you keep up-to-date with those you know and those who interest you.\n\n". "%2\$s is a micro-blogging service that lets you keep up-to-date with people you know and people who interest you.\n\n".
"You can also share news about yourself, your thoughts, or your life online with users who know about you. ". "You can also share news about yourself, your thoughts, or your life online with people who know about you. ".
"It is also great for meeting others who share your interests.\n\n". "It's also great for meeting new people who share your interests.\n\n".
"%1\$s said:\n\n%4\$s\n\n". "%1\$s said:\n\n%4\$s\n\n".
"You can see %1\$s's profile page on %2\$s here:\n\n". "You can see %1\$s's profile page on %2\$s here:\n\n".
"%5\$s\n\n". "%5\$s\n\n".

2
actions/noticesearch.php
View File

@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/searchaction.php';
* @author Robin Millette <millette@status.net> * @author Robin Millette <millette@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/ * @link http://status.net/
* @todo common parent for user and content search? * @todo common parent for people and content search?
*/ */
class NoticesearchAction extends SearchAction class NoticesearchAction extends SearchAction
{ {

2
actions/opensearch.php
View File

@ -61,7 +61,7 @@ class OpensearchAction extends Action
$short_name = ''; $short_name = '';
if ($type == 'people') { if ($type == 'people') {
$type = 'peoplesearch'; $type = 'peoplesearch';
$short_name = _('User Search'); $short_name = _('People Search');
} else { } else {
$type = 'noticesearch'; $type = 'noticesearch';
$short_name = _('Notice Search'); $short_name = _('Notice Search');

2
actions/peoplesearch.php
View File

@ -49,7 +49,7 @@ class PeoplesearchAction extends SearchAction
{ {
function getInstructions() function getInstructions()
{ {
return _('Search for users on %%site.name%% by their name, location, or interests. ' . return _('Search for people on %%site.name%% by their name, location, or interests. ' .
'Separate the terms by spaces; they must be 3 characters or more.'); 'Separate the terms by spaces; they must be 3 characters or more.');
} }

2
actions/peopletag.php
View File

@ -67,7 +67,7 @@ class PeopletagAction extends Action
$this->tag = $this->trimmed('tag'); $this->tag = $this->trimmed('tag');
if (!common_valid_profile_tag($this->tag)) { if (!common_valid_profile_tag($this->tag)) {
$this->clientError(sprintf(_('Not a valid user tag: %s'), $this->clientError(sprintf(_('Not a valid people tag: %s'),
$this->tag)); $this->tag));
return; return;
} }

4
actions/profilesettings.php
View File

@ -68,8 +68,8 @@ class ProfilesettingsAction extends AccountSettingsAction
function getInstructions() function getInstructions()
{ {
return _('You can update your personal profile info here ' . return _('You can update your personal profile info here '.
'so readers know more about you.'); 'so people know more about you.');
} }
function showScripts() function showScripts()

10
actions/register.php
View File

@ -82,14 +82,14 @@ class RegisterAction extends Action
} }
if (common_config('site', 'inviteonly') && empty($this->code)) { if (common_config('site', 'inviteonly') && empty($this->code)) {
$this->clientError(_('Sorry. Only those invited can register.')); $this->clientError(_('Sorry, only invited people can register.'));
return false; return false;
} }
if (!empty($this->code)) { if (!empty($this->code)) {
$this->invite = Invitation::staticGet('code', $this->code); $this->invite = Invitation::staticGet('code', $this->code);
if (empty($this->invite)) { if (empty($this->invite)) {
$this->clientError(_('Sorry. This is an invalid invitation code.')); $this->clientError(_('Sorry, invalid invitation code.'));
return false; return false;
} }
// Store this in case we need it // Store this in case we need it
@ -186,7 +186,7 @@ class RegisterAction extends Action
} }
if (common_config('site', 'inviteonly') && !($code && $invite)) { if (common_config('site', 'inviteonly') && !($code && $invite)) {
$this->clientError(_('Sorry. Only those invited can register.')); $this->clientError(_('Sorry, only invited people can register.'));
return; return;
} }
@ -401,7 +401,7 @@ class RegisterAction extends Action
} }
if (common_config('site', 'inviteonly') && !($code && $invite)) { if (common_config('site', 'inviteonly') && !($code && $invite)) {
$this->clientError(_('Sorry. Only those invited can register.')); $this->clientError(_('Sorry, only invited people can register.'));
return; return;
} }
@ -542,7 +542,7 @@ class RegisterAction extends Action
'(%%%%action.imsettings%%%%) '. '(%%%%action.imsettings%%%%) '.
'so you can send notices '. 'so you can send notices '.
'through instant messages.' . "\n" . 'through instant messages.' . "\n" .
'* [Search for users](%%%%action.peoplesearch%%%%) '. '* [Search for people](%%%%action.peoplesearch%%%%) '.
'that you may know or '. 'that you may know or '.
'that share your interests. ' . "\n" . 'that share your interests. ' . "\n" .
'* Update your [profile settings]'. '* Update your [profile settings]'.

4
actions/replies.php
View File

@ -195,12 +195,12 @@ class RepliesAction extends OwnerDesignAction
function showEmptyListMessage() function showEmptyListMessage()
{ {
$message = sprintf(_('This is the timeline showing replies to %s but %s has not received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user(); $current_user = common_current_user();
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message .= _('You can engage other users in a conversation, subscribe to more users or [join groups](%%action.groups%%).'); $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
} else { } else {
$message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
} }

2
actions/smssettings.php
View File

@ -525,7 +525,7 @@ class SmssettingsAction extends ConnectSettingsAction
if (!$user->updateKeys($orig)) { if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__); common_log_db_error($user, 'UPDATE', __FILE__);
$this->serverError(_("Could not update user record.")); $this->serverError(_("Couldn't update user record."));
} }
$this->showForm(_('Incoming email address removed.'), true); $this->showForm(_('Incoming email address removed.'), true);

8
actions/subscribers.php
View File

@ -60,12 +60,12 @@ class SubscribersAction extends GalleryAction
$user =& common_current_user(); $user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) { if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null, $this->element('p', null,
_('These are the users who have subscribed to '. _('These are the people who listen to '.
'your notices.')); 'your notices.'));
} else { } else {
$this->element('p', null, $this->element('p', null,
sprintf(_('These are the users who '. sprintf(_('These are the people who '.
'have subscribed to %s\'s notices.'), 'listen to %s\'s notices.'),
$this->profile->nickname)); $this->profile->nickname));
} }
} }
@ -105,7 +105,7 @@ class SubscribersAction extends GalleryAction
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user(); $current_user = common_current_user();
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message = _('You have no subscribers. Try subscribing to users you know and they might return the favor'); $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
} else { } else {
$message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname); $message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
} }

10
actions/subscriptions.php
View File

@ -62,12 +62,12 @@ class SubscriptionsAction extends GalleryAction
$user =& common_current_user(); $user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) { if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null, $this->element('p', null,
_('These are the users whose notices '. _('These are the people whose notices '.
'you have subscribed to.')); 'you listen to.'));
} else { } else {
$this->element('p', null, $this->element('p', null,
sprintf(_('These are the users whose '. sprintf(_('These are the people whose '.
'notices %s has subscribed to.'), 'notices %s listens to.'),
$this->profile->nickname)); $this->profile->nickname));
} }
} }
@ -118,7 +118,7 @@ class SubscriptionsAction extends GalleryAction
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user(); $current_user = common_current_user();
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message = _('You have not subscribed to anyone\'s notices right now. Try subscribing to users you know. Try [user search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you are a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to users you already follow there.'); $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to people you already follow there.');
} else { } else {
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname); $message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
} }

2
actions/tagother.php
View File

@ -190,7 +190,7 @@ class TagotherAction extends Action
!Subscription::pkeyGet(array('subscriber' => $this->profile->id, !Subscription::pkeyGet(array('subscriber' => $this->profile->id,
'subscribed' => $user->id))) 'subscribed' => $user->id)))
{ {
$this->clientError(_('You can only tag users you are subscribed to or who are subscribed to you.')); $this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
return; return;
} }

2
classes/File.php
View File

@ -99,7 +99,7 @@ class File extends Memcached_DataObject
} elseif (is_string($redir_data)) { } elseif (is_string($redir_data)) {
$redir_url = $redir_data; $redir_url = $redir_data;
} else { } else {
throw new ServerException("Cannot process url '$given_url'"); throw new ServerException("Can't process url '$given_url'");
} }
// TODO: max field length // TODO: max field length
if ($redir_url === $given_url || strlen($redir_url) > 255) { if ($redir_url === $given_url || strlen($redir_url) > 255) {

4
classes/Notice.php
View File

@ -680,7 +680,7 @@ class Notice extends Memcached_DataObject
return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null); return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
} }
# Get the cache; if we cannot, just go to the DB # Get the cache; if we can't, just go to the DB
$cache = common_memcache(); $cache = common_memcache();
@ -1364,7 +1364,7 @@ class Notice extends Memcached_DataObject
} }
} }
// If it's not a "low bandwidth" source (one where you cannot set // If it's not a "low bandwidth" source (one where you can't set
// a reply_to argument), we return. This is mostly web and API // a reply_to argument), we return. This is mostly web and API
// clients. // clients.

2
extlib/Auth/OpenID/Consumer.php
View File

@ -1059,7 +1059,7 @@ class Auth_OpenID_GenericConsumer {
} }
} }
// Fragments do not influence discovery, so we cannot compare a // Fragments do not influence discovery, so we can't compare a
// claimed identifier with a fragment to discovered // claimed identifier with a fragment to discovered
// information. // information.
list($defragged_claimed_id, $_) = list($defragged_claimed_id, $_) =

4
extlib/Auth/OpenID/Discover.php
View File

@ -515,7 +515,7 @@ function Auth_OpenID_discoverXRI($iname, &$fetcher)
function Auth_OpenID_discover($uri, &$fetcher) function Auth_OpenID_discover($uri, &$fetcher)
{ {
// If the fetcher (i.e., PHP) doesn't support SSL, we cannot do // If the fetcher (i.e., PHP) doesn't support SSL, we can't do
// discovery on an HTTPS URL. // discovery on an HTTPS URL.
if ($fetcher->isHTTPS($uri) && !$fetcher->supportsSSL()) { if ($fetcher->isHTTPS($uri) && !$fetcher->supportsSSL()) {
return array($uri, array()); return array($uri, array());
@ -527,7 +527,7 @@ function Auth_OpenID_discover($uri, &$fetcher)
$result = Auth_OpenID_discoverURI($uri, $fetcher); $result = Auth_OpenID_discoverURI($uri, $fetcher);
} }
// If the fetcher doesn't support SSL, we cannot interact with // If the fetcher doesn't support SSL, we can't interact with
// HTTPS server URLs; remove those endpoints from the list. // HTTPS server URLs; remove those endpoints from the list.
if (!$fetcher->supportsSSL()) { if (!$fetcher->supportsSSL()) {
$http_endpoints = array(); $http_endpoints = array();

2
extlib/Auth/OpenID/FileStore.php
View File

@ -496,7 +496,7 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore {
return true; return true;
} else { } else {
// Could not open directory. // Couldn't open directory.
return false; return false;
} }
} }

2
extlib/DB.php
View File

@ -1341,7 +1341,7 @@ class DB_result
* returning the total number of rows that would have been returned, * returning the total number of rows that would have been returned,
* rather than the real number. As a result, we'll just do the limit * rather than the real number. As a result, we'll just do the limit
* calculations for fbsql in the same way as a database with emulated * calculations for fbsql in the same way as a database with emulated
* limits. Unfortunately, we cannot just do this in DB_fbsql::numRows() * limits. Unfortunately, we can't just do this in DB_fbsql::numRows()
* because that only gets the result resource, rather than the full * because that only gets the result resource, rather than the full
* DB_Result object. */ * DB_Result object. */
if (($this->dbh->features['limit'] === 'emulate' if (($this->dbh->features['limit'] === 'emulate'

4
extlib/DB/DataObject/Generator.php
View File

@ -632,7 +632,7 @@ class DB_DataObject_Generator extends DB_DataObject
echo "*****************************************************************\n". echo "*****************************************************************\n".
"** WARNING COLUMN NAME UNUSABLE **\n". "** WARNING COLUMN NAME UNUSABLE **\n".
"** Found column '{$t->name}', of type '{$t->type}' **\n". "** Found column '{$t->name}', of type '{$t->type}' **\n".
"** Since this column name cannot be converted to a php variable **\n". "** Since this column name can't be converted to a php variable **\n".
"** name, and the whole idea of mapping would result in a mess **\n". "** name, and the whole idea of mapping would result in a mess **\n".
"** This column has been ignored... **\n". "** This column has been ignored... **\n".
"*****************************************************************\n"; "*****************************************************************\n";
@ -910,7 +910,7 @@ class DB_DataObject_Generator extends DB_DataObject
echo "*****************************************************************\n". echo "*****************************************************************\n".
"** WARNING COLUMN NAME UNUSABLE **\n". "** WARNING COLUMN NAME UNUSABLE **\n".
"** Found column '{$t->name}', of type '{$t->type}' **\n". "** Found column '{$t->name}', of type '{$t->type}' **\n".
"** Since this column name cannot be converted to a php variable **\n". "** Since this column name can't be converted to a php variable **\n".
"** name, and the whole idea of mapping would result in a mess **\n". "** name, and the whole idea of mapping would result in a mess **\n".
"** This column has been ignored... **\n". "** This column has been ignored... **\n".
"*****************************************************************\n"; "*****************************************************************\n";

6
extlib/DB/dbase.php
View File

@ -287,7 +287,7 @@ class DB_dbase extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -352,7 +352,7 @@ class DB_dbase extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -373,7 +373,7 @@ class DB_dbase extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

8
extlib/DB/fbsql.php
View File

@ -262,7 +262,7 @@ class DB_fbsql extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -309,7 +309,7 @@ class DB_fbsql extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -376,7 +376,7 @@ class DB_fbsql extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -401,7 +401,7 @@ class DB_fbsql extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

6
extlib/DB/ibase.php
View File

@ -353,7 +353,7 @@ class DB_ibase extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -402,7 +402,7 @@ class DB_ibase extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -449,7 +449,7 @@ class DB_ibase extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

12
extlib/DB/ifx.php
View File

@ -147,7 +147,7 @@ class DB_ifx extends DB_common
/** /**
* The quantity of transactions begun * The quantity of transactions begun
* *
* {@internal While this is private, it cannot actually be designated * {@internal While this is private, it can't actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}} * private in PHP 5 because it is directly accessed in the test suite.}}
* *
* @var integer * @var integer
@ -328,7 +328,7 @@ class DB_ifx extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -387,7 +387,7 @@ class DB_ifx extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -411,7 +411,7 @@ class DB_ifx extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -555,7 +555,7 @@ class DB_ifx extends DB_common
* *
* If analyzing a query result and the result has duplicate field names, * If analyzing a query result and the result has duplicate field names,
* an error will be raised saying * an error will be raised saying
* <samp>cannot distinguish duplicate field names</samp>. * <samp>can't distinguish duplicate field names</samp>.
* *
* @param object|string $result DB_result object from a query or a * @param object|string $result DB_result object from a query or a
* string containing the name of a table. * string containing the name of a table.
@ -604,7 +604,7 @@ class DB_ifx extends DB_common
$count = @ifx_num_fields($id); $count = @ifx_num_fields($id);
if (count($flds) != $count) { if (count($flds) != $count) {
return $this->raiseError("cannot distinguish duplicate field names"); return $this->raiseError("can't distinguish duplicate field names");
} }
if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) { if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {

8
extlib/DB/msql.php
View File

@ -288,7 +288,7 @@ class DB_msql extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* PHP's mSQL extension did weird things with NULL values prior to PHP * PHP's mSQL extension did weird things with NULL values prior to PHP
@ -339,7 +339,7 @@ class DB_msql extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -360,7 +360,7 @@ class DB_msql extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -385,7 +385,7 @@ class DB_msql extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

10
extlib/DB/mssql.php
View File

@ -156,7 +156,7 @@ class DB_mssql extends DB_common
/** /**
* The quantity of transactions begun * The quantity of transactions begun
* *
* {@internal While this is private, it cannot actually be designated * {@internal While this is private, it can't actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}} * private in PHP 5 because it is directly accessed in the test suite.}}
* *
* @var integer * @var integer
@ -324,7 +324,7 @@ class DB_mssql extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -371,7 +371,7 @@ class DB_mssql extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -392,7 +392,7 @@ class DB_mssql extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -417,7 +417,7 @@ class DB_mssql extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

14
extlib/DB/mysql.php
View File

@ -139,7 +139,7 @@ class DB_mysql extends DB_common
/** /**
* The quantity of transactions begun * The quantity of transactions begun
* *
* {@internal While this is private, it cannot actually be designated * {@internal While this is private, it can't actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}} * private in PHP 5 because it is directly accessed in the test suite.}}
* *
* @var integer * @var integer
@ -359,7 +359,7 @@ class DB_mysql extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -411,7 +411,7 @@ class DB_mysql extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -432,7 +432,7 @@ class DB_mysql extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -457,7 +457,7 @@ class DB_mysql extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -722,7 +722,7 @@ class DB_mysql extends DB_common
return $result; return $result;
} }
if ($result == 0) { if ($result == 0) {
// Failed to get the lock, cannot do the conversion, bail // Failed to get the lock, can't do the conversion, bail
// with a DB_ERROR_NOT_LOCKED error // with a DB_ERROR_NOT_LOCKED error
return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED); return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
} }
@ -757,7 +757,7 @@ class DB_mysql extends DB_common
* Quotes a string so it can be safely used as a table or column name * Quotes a string so it can be safely used as a table or column name
* (WARNING: using names that require this is a REALLY BAD IDEA) * (WARNING: using names that require this is a REALLY BAD IDEA)
* *
* WARNING: Older versions of MySQL cannot handle the backtick * WARNING: Older versions of MySQL can't handle the backtick
* character (<kbd>`</kbd>) in table or column names. * character (<kbd>`</kbd>) in table or column names.
* *
* @param string $str identifier name to be quoted * @param string $str identifier name to be quoted

14
extlib/DB/mysqli.php
View File

@ -142,7 +142,7 @@ class DB_mysqli extends DB_common
/** /**
* The quantity of transactions begun * The quantity of transactions begun
* *
* {@internal While this is private, it cannot actually be designated * {@internal While this is private, it can't actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}} * private in PHP 5 because it is directly accessed in the test suite.}}
* *
* @var integer * @var integer
@ -434,7 +434,7 @@ class DB_mysqli extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -486,7 +486,7 @@ class DB_mysqli extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -507,7 +507,7 @@ class DB_mysqli extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -532,7 +532,7 @@ class DB_mysqli extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -796,7 +796,7 @@ class DB_mysqli extends DB_common
return $result; return $result;
} }
if ($result == 0) { if ($result == 0) {
// Failed to get the lock, cannot do the conversion, bail // Failed to get the lock, can't do the conversion, bail
// with a DB_ERROR_NOT_LOCKED error // with a DB_ERROR_NOT_LOCKED error
return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED); return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED);
} }
@ -832,7 +832,7 @@ class DB_mysqli extends DB_common
* Quotes a string so it can be safely used as a table or column name * Quotes a string so it can be safely used as a table or column name
* (WARNING: using names that require this is a REALLY BAD IDEA) * (WARNING: using names that require this is a REALLY BAD IDEA)
* *
* WARNING: Older versions of MySQL cannot handle the backtick * WARNING: Older versions of MySQL can't handle the backtick
* character (<kbd>`</kbd>) in table or column names. * character (<kbd>`</kbd>) in table or column names.
* *
* @param string $str identifier name to be quoted * @param string $str identifier name to be quoted

10
extlib/DB/oci8.php
View File

@ -251,7 +251,7 @@ class DB_oci8 extends DB_common
$char); $char);
$error = OCIError(); $error = OCIError();
if (!empty($error) && $error['code'] == 12541) { if (!empty($error) && $error['code'] == 12541) {
// Could not find TNS listener. Try direct connection. // Couldn't find TNS listener. Try direct connection.
$this->connection = @$connect_function($dsn['username'], $this->connection = @$connect_function($dsn['username'],
$dsn['password'], $dsn['password'],
null, null,
@ -368,7 +368,7 @@ class DB_oci8 extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -415,7 +415,7 @@ class DB_oci8 extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -468,7 +468,7 @@ class DB_oci8 extends DB_common
* is turned on. * is turned on.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -511,7 +511,7 @@ class DB_oci8 extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

8
extlib/DB/odbc.php
View File

@ -301,7 +301,7 @@ class DB_odbc extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -356,7 +356,7 @@ class DB_odbc extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -377,7 +377,7 @@ class DB_odbc extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -427,7 +427,7 @@ class DB_odbc extends DB_common
* a DB_Error object for DB_ERROR_UNSUPPORTED is returned. * a DB_Error object for DB_ERROR_UNSUPPORTED is returned.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

10
extlib/DB/pgsql.php
View File

@ -115,7 +115,7 @@ class DB_pgsql extends DB_common
/** /**
* The quantity of transactions begun * The quantity of transactions begun
* *
* {@internal While this is private, it cannot actually be designated * {@internal While this is private, it can't actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}} * private in PHP 5 because it is directly accessed in the test suite.}}
* *
* @var integer * @var integer
@ -397,7 +397,7 @@ class DB_pgsql extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -445,7 +445,7 @@ class DB_pgsql extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -535,7 +535,7 @@ class DB_pgsql extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -560,7 +560,7 @@ class DB_pgsql extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

8
extlib/DB/sqlite.php
View File

@ -334,7 +334,7 @@ class DB_sqlite extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -396,7 +396,7 @@ class DB_sqlite extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -422,7 +422,7 @@ class DB_sqlite extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -447,7 +447,7 @@ class DB_sqlite extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource

12
extlib/DB/sybase.php
View File

@ -118,7 +118,7 @@ class DB_sybase extends DB_common
/** /**
* The quantity of transactions begun * The quantity of transactions begun
* *
* {@internal While this is private, it cannot actually be designated * {@internal While this is private, it can't actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}} * private in PHP 5 because it is directly accessed in the test suite.}}
* *
* @var integer * @var integer
@ -302,7 +302,7 @@ class DB_sybase extends DB_common
* See DB_result::fetchInto() for more information. * See DB_result::fetchInto() for more information.
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::fetchInto() instead. It cannot be declared "protected" * DB_result::fetchInto() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result the query result resource * @param resource $result the query result resource
@ -359,7 +359,7 @@ class DB_sybase extends DB_common
* Deletes the result set and frees the memory occupied by the result set * Deletes the result set and frees the memory occupied by the result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::free() instead. It cannot be declared "protected" * DB_result::free() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -380,7 +380,7 @@ class DB_sybase extends DB_common
* Gets the number of columns in a result set * Gets the number of columns in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numCols() instead. It cannot be declared "protected" * DB_result::numCols() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -405,7 +405,7 @@ class DB_sybase extends DB_common
* Gets the number of rows in a result set * Gets the number of rows in a result set
* *
* This method is not meant to be called directly. Use * This method is not meant to be called directly. Use
* DB_result::numRows() instead. It cannot be declared "protected" * DB_result::numRows() instead. It can't be declared "protected"
* because DB_result is a separate object. * because DB_result is a separate object.
* *
* @param resource $result PHP's query result resource * @param resource $result PHP's query result resource
@ -835,7 +835,7 @@ class DB_sybase extends DB_common
$tableName = $table; $tableName = $table;
/* We're running sp_helpindex directly because it doesn't exist in /* We're running sp_helpindex directly because it doesn't exist in
* older versions of ASE -- unfortunately, we cannot just use * older versions of ASE -- unfortunately, we can't just use
* DB::isError() because the user may be using callback error * DB::isError() because the user may be using callback error
* handling. */ * handling. */
$res = @sybase_query("sp_helpindex $table", $this->connection); $res = @sybase_query("sp_helpindex $table", $this->connection);

1940
extlib/HTTP/Request2/Adapter/Socket.php
View File

File diff suppressed because it is too large Load Diff

4
extlib/MIME/Type.php
View File

@ -478,7 +478,7 @@ class MIME_Type
// Don't return an empty string // Don't return an empty string
if (!$type || !strlen($type)) { if (!$type || !strlen($type)) {
return PEAR::raiseError("Sorry. Could not determine file type."); return PEAR::raiseError("Sorry, couldn't determine file type.");
} }
// Strip parameters if present & requested // Strip parameters if present & requested
@ -510,7 +510,7 @@ class MIME_Type
$fileCmd = PEAR::getStaticProperty('MIME_Type', 'fileCmd'); $fileCmd = PEAR::getStaticProperty('MIME_Type', 'fileCmd');
if (!$cmd->which($fileCmd)) { if (!$cmd->which($fileCmd)) {
unset($cmd); unset($cmd);
return PEAR::raiseError("Cannot find file command \"{$fileCmd}\""); return PEAR::raiseError("Can't find file command \"{$fileCmd}\"");
} }
$cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file)); $cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file));

4
extlib/MIME/Type/Extension.php
View File

@ -265,7 +265,7 @@ class MIME_Type_Extension
} }
if (!isset($this->extensionToType[$extension])) { if (!isset($this->extensionToType[$extension])) {
return PEAR::raiseError("Sorry. Could not determine file type."); return PEAR::raiseError("Sorry, couldn't determine file type.");
} }
return $this->extensionToType[$extension]; return $this->extensionToType[$extension];
@ -288,7 +288,7 @@ class MIME_Type_Extension
$extension = array_search($type, $this->extensionToType); $extension = array_search($type, $this->extensionToType);
if ($extension === false) { if ($extension === false) {
return PEAR::raiseError("Sorry. Could not determine extension."); return PEAR::raiseError("Sorry, couldn't determine extension.");
} }
return $extension; return $extension;
} }

2
extlib/Mail/mail.php
View File

@ -51,7 +51,7 @@ class Mail_mail extends Mail {
} }
/* Because the mail() function may pass headers as command /* Because the mail() function may pass headers as command
* line arguments, we cannot guarantee the use of the standard * line arguments, we can't guarantee the use of the standard
* "\r\n" separator. Instead, we use the system's native line * "\r\n" separator. Instead, we use the system's native line
* separator. */ * separator. */
if (defined('PHP_EOL')) { if (defined('PHP_EOL')) {

2
extlib/Mail/sendmail.php
View File

@ -67,7 +67,7 @@ class Mail_sendmail extends Mail {
/* /*
* Because we need to pass message headers to the sendmail program on * Because we need to pass message headers to the sendmail program on
* the commandline, we cannot guarantee the use of the standard "\r\n" * the commandline, we can't guarantee the use of the standard "\r\n"
* separator. Instead, we use the system's native line separator. * separator. Instead, we use the system's native line separator.
*/ */
if (defined('PHP_EOL')) { if (defined('PHP_EOL')) {

2
extlib/Net/LDAP2/Entry.php
View File

@ -665,7 +665,7 @@ class Net_LDAP2_Entry extends PEAR
* To force replace mode instead of add, you can set $force to true. * To force replace mode instead of add, you can set $force to true.
* *
* @param array $attr Attributes to replace * @param array $attr Attributes to replace
* @param bool $force Force replacing mode in case we cannot read the attr value but are allowed to replace it * @param bool $force Force replacing mode in case we can't read the attr value but are allowed to replace it
* *
* @access public * @access public
* @return true|Net_LDAP2_Error * @return true|Net_LDAP2_Error

2
extlib/Net/LDAP2/Filter.php
View File

@ -439,7 +439,7 @@ class Net_LDAP2_Filter extends PEAR
* *
* This method is only for compatibility to the perl interface. * This method is only for compatibility to the perl interface.
* However, the original method was called "print" but due to PHP language restrictions, * However, the original method was called "print" but due to PHP language restrictions,
* we cannot have a print() method. * we can't have a print() method.
* *
* @param resource $FH (optional) A filehandle resource * @param resource $FH (optional) A filehandle resource
* *

2
extlib/System/Command.php
View File

@ -376,7 +376,7 @@ class System_Command {
return $this->_initError; return $this->_initError;
} }
// if the command is empty or if the last element was a control operator, we cannot continue // if the command is empty or if the last element was a control operator, we can't continue
if (is_null($this->previousElement) || $this->commandStatus == -1 || in_array($this->previousElement, $this->controlOperators)) { if (is_null($this->previousElement) || $this->commandStatus == -1 || in_array($this->previousElement, $this->controlOperators)) {
return PEAR::raiseError(null, SYSTEM_COMMAND_INVALID_COMMAND, null, E_USER_WARNING, $this->systemCommand, 'System_Command_Error', true); return PEAR::raiseError(null, SYSTEM_COMMAND_INVALID_COMMAND, null, E_USER_WARNING, $this->systemCommand, 'System_Command_Error', true);
} }

2
extlib/markdown.php
View File

@ -1348,7 +1348,7 @@ class Markdown_Parser {
// { // {
// list(, $div_open, , $div_content, $div_close) = $matches; // list(, $div_open, , $div_content, $div_close) = $matches;
// //
// # We cannot call Markdown(), because that resets the hash; // # We can't call Markdown(), because that resets the hash;
// # that initialization code should be pulled into its own sub, though. // # that initialization code should be pulled into its own sub, though.
// $div_content = $this->hashHTMLBlocks($div_content); // $div_content = $this->hashHTMLBlocks($div_content);
// //

16
install.php
View File

@ -391,7 +391,7 @@ function showLibs()
libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p> libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p>
<p>On Debian based distributions, such as Ubuntu, use a package manager (such as &quot;aptitude&quot;, &quot;apt-get&quot;, and &quot;synaptic&quot;) to install the package listed.</p> <p>On Debian based distributions, such as Ubuntu, use a package manager (such as &quot;aptitude&quot;, &quot;apt-get&quot;, and &quot;synaptic&quot;) to install the package listed.</p>
<p>On RPM based distributions, such as Red Hat, Fedora, CentOS, Scientific Linux, Yellow Dog Linux and Oracle Enterprise Linux, use a package manager (such as &quot;yum&quot;, &quot;apt-rpm&quot;, and &quot;up2date&quot;) to install the package listed.</p> <p>On RPM based distributions, such as Red Hat, Fedora, CentOS, Scientific Linux, Yellow Dog Linux and Oracle Enterprise Linux, use a package manager (such as &quot;yum&quot;, &quot;apt-rpm&quot;, and &quot;up2date&quot;) to install the package listed.</p>
<p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP PEAR to install the library. Simply run &quot;pear install &lt;name&gt;&quot;.</p> <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP's PEAR to install the library. Simply run &quot;pear install &lt;name&gt;&quot;.</p>
</div> </div>
<h2>Absent Libraries</h2> <h2>Absent Libraries</h2>
<ul id="absent_libraries"> <ul id="absent_libraries">
@ -570,7 +570,7 @@ STR;
$res = writeConf($sitename, $server, $path, $fancy, $db); $res = writeConf($sitename, $server, $path, $fancy, $db);
if (!$res) { if (!$res) {
updateStatus("Cannot write config file.", true); updateStatus("Can't write config file.", true);
showForm(); showForm();
return; return;
} }
@ -616,7 +616,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
$res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql'); $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
if ($res === false) { if ($res === false) {
updateStatus("Cannot run database script.", true); updateStatus("Can't run database script.", true);
showForm(); showForm();
return false; return false;
} }
@ -627,7 +627,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
updateStatus(sprintf("Adding %s data to database...", $name)); updateStatus(sprintf("Adding %s data to database...", $name));
$res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql'); $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql');
if ($res === false) { if ($res === false) {
updateStatus(sprintf("Cannot run %d script.", $name), true); updateStatus(sprintf("Can't run %d script.", $name), true);
showForm(); showForm();
return false; return false;
} }
@ -652,21 +652,21 @@ function Mysql_Db_installer($host, $database, $username, $password)
$conn = mysql_connect($host, $username, $password); $conn = mysql_connect($host, $username, $password);
if (!$conn) { if (!$conn) {
updateStatus("Cannot connect to server '$host' as '$username'.", true); updateStatus("Can't connect to server '$host' as '$username'.", true);
showForm(); showForm();
return false; return false;
} }
updateStatus("Changing to database..."); updateStatus("Changing to database...");
$res = mysql_select_db($database, $conn); $res = mysql_select_db($database, $conn);
if (!$res) { if (!$res) {
updateStatus("Cannot change to database.", true); updateStatus("Can't change to database.", true);
showForm(); showForm();
return false; return false;
} }
updateStatus("Running database script..."); updateStatus("Running database script...");
$res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn); $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
if ($res === false) { if ($res === false) {
updateStatus("Cannot run database script.", true); updateStatus("Can't run database script.", true);
showForm(); showForm();
return false; return false;
} }
@ -677,7 +677,7 @@ function Mysql_Db_installer($host, $database, $username, $password)
updateStatus(sprintf("Adding %s data to database...", $name)); updateStatus(sprintf("Adding %s data to database...", $name));
$res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn); $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
if ($res === false) { if ($res === false) {
updateStatus(sprintf("Cannot run %d script.", $name), true); updateStatus(sprintf("Can't run %d script.", $name), true);
showForm(); showForm();
return false; return false;
} }

2
lib/action.php
View File

@ -456,7 +456,7 @@ class Action extends HTMLOutputter // lawsuit
_('Help'), _('Help me!'), false, 'nav_help'); _('Help'), _('Help me!'), false, 'nav_help');
if ($user || !common_config('site', 'private')) { if ($user || !common_config('site', 'private')) {
$this->menuItem(common_local_url('peoplesearch'), $this->menuItem(common_local_url('peoplesearch'),
_('Search'), _('Search for users or text'), false, 'nav_search'); _('Search'), _('Search for people or text'), false, 'nav_search');
} }
Event::handle('EndPrimaryNav', array($this)); Event::handle('EndPrimaryNav', array($this));
} }

2
lib/attachmentlist.php
View File

@ -71,7 +71,7 @@ class AttachmentList extends Widget
/** /**
* show the list of notices * show the list of notices
* *
* "Uses up" the stream by looping through it. So, probably cannot * "Uses up" the stream by looping through it. So, probably can't
* be called twice on the same list. * be called twice on the same list.
* *
* @return int count of notices listed. * @return int count of notices listed.

2
lib/noticelist.php
View File

@ -75,7 +75,7 @@ class NoticeList extends Widget
/** /**
* show the list of notices * show the list of notices
* *
* "Uses up" the stream by looping through it. So, probably cannot * "Uses up" the stream by looping through it. So, probably can't
* be called twice on the same list. * be called twice on the same list.
* *
* @return int count of notices listed. * @return int count of notices listed.

2
lib/profilelist.php
View File

@ -269,7 +269,7 @@ class ProfileListItem extends Widget
$usf = new UnsubscribeForm($this->out, $this->profile); $usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show(); $usf->show();
} else { } else {
// Is it a local user? cannot remote sub from a list // Is it a local user? can't remote sub from a list
// XXX: make that possible! // XXX: make that possible!
$other = User::staticGet('id', $this->profile->id); $other = User::staticGet('id', $this->profile->id);
if (!empty($other)) { if (!empty($other)) {

2
lib/serverexception.php
View File

@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
/** /**
* Class for server exceptions * Class for server exceptions
* *
* Subclass of PHP Exception for server errors. The user typically cannot fix these. * Subclass of PHP Exception for server errors. The user typically can't fix these.
* *
* @category Exception * @category Exception
* @package StatusNet * @package StatusNet

2
lib/settingsaction.php
View File

@ -72,7 +72,7 @@ class SettingsAction extends CurrentUserDesignAction
$this->clientError(_('Not logged in.')); $this->clientError(_('Not logged in.'));
return; return;
} else if (!common_is_real_login()) { } else if (!common_is_real_login()) {
// Cookie theft means that automatic logins cannot // Cookie theft means that automatic logins can't
// change important settings or see private info, and // change important settings or see private info, and
// _all_ our settings are important // _all_ our settings are important
common_set_returnto($this->selfUrl()); common_set_returnto($this->selfUrl());

2
lib/util.php
View File

@ -576,7 +576,7 @@ function common_linkify($url) {
} elseif (is_string($longurl_data)) { } elseif (is_string($longurl_data)) {
$longurl = $longurl_data; $longurl = $longurl_data;
} else { } else {
throw new ServerException("Cannot linkify url '$url'"); throw new ServerException("Can't linkify url '$url'");
} }
} }
$attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external'); $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');

2
lib/xmppqueuehandler.php
View File

@ -43,7 +43,7 @@ class XmppQueueHandler extends QueueHandler
$this->conn = jabber_connect($this->_id.$this->transport()); $this->conn = jabber_connect($this->_id.$this->transport());
if (empty($this->conn)) { if (empty($this->conn)) {
$this->log(LOG_ERR, "Could not connect to server."); $this->log(LOG_ERR, "Couldn't connect to server.");
return false; return false;
} }

10286
locale/statusnet.po
View File

File diff suppressed because it is too large Load Diff

2
plugins/Facebook/facebook/facebookapi_php5_restlib.php
View File

@ -2951,7 +2951,7 @@ function toggleDisplay(id, type) {
/** /**
* Bans a list of users from the app. Banned users cannot * Bans a list of users from the app. Banned users can't
* access the app's canvas page and forums. * access the app's canvas page and forums.
* *
* @param array $uids an array of user ids * @param array $uids an array of user ids

2
plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
View File

@ -124,7 +124,7 @@ class Services_JSON
* "{...}" syntax creates associative arrays * "{...}" syntax creates associative arrays
* instead of objects in decode(). * instead of objects in decode().
* - SERVICES_JSON_SUPPRESS_ERRORS: error suppression. * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
* Values which cannot be encoded (e.g. resources) * Values which can't be encoded (e.g. resources)
* appear as NULL instead of throwing errors. * appear as NULL instead of throwing errors.
* By default, a deeply-nested resource will * By default, a deeply-nested resource will
* bubble up with an error, so all return values * bubble up with an error, so all return values

2
plugins/Facebook/facebookaction.php
View File

@ -513,7 +513,7 @@ class FacebookNoticeList extends NoticeList
/** /**
* show the list of notices * show the list of notices
* *
* "Uses up" the stream by looping through it. So, probably cannot * "Uses up" the stream by looping through it. So, probably can't
* be called twice on the same list. * be called twice on the same list.
* *
* @return int count of notices listed. * @return int count of notices listed.

2
plugins/Facebook/facebookhome.php
View File

@ -108,7 +108,7 @@ class FacebookhomeAction extends FacebookAction
$user = User::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
if (!$user) { if (!$user) {
$this->showLoginForm(_("Server error. Could not get user.")); $this->showLoginForm(_("Server error - couldn't get user!"));
} }
$flink = DB_DataObject::factory('foreign_link'); $flink = DB_DataObject::factory('foreign_link');

2
plugins/LinkbackPlugin.php
View File

@ -125,7 +125,7 @@ class LinkbackPlugin extends Plugin
if (!extension_loaded('xmlrpc')) { if (!extension_loaded('xmlrpc')) {
if (!dl('xmlrpc.so')) { if (!dl('xmlrpc.so')) {
common_log(LOG_ERR, "Cannot pingback; xmlrpc extension not available."); common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available.");
} }
} }

2
plugins/Meteor/MeteorPlugin.php
View File

@ -85,7 +85,7 @@ class MeteorPlugin extends RealtimePlugin
// May throw an exception. // May throw an exception.
$this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}"); $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}");
if (!$this->_socket) { if (!$this->_socket) {
throw new Exception("Could not connect to {$controlserver} on {$this->controlport}"); throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}");
} }
} }

4
plugins/OpenID/openid.php
View File

@ -36,7 +36,7 @@ function oid_store()
{ {
static $store = null; static $store = null;
if (!$store) { if (!$store) {
# Cannot be called statically # Can't be called statically
$user = new User(); $user = new User();
$conn = $user->getDatabaseConnection(); $conn = $user->getDatabaseConnection();
$store = new Auth_OpenID_MySQLStore($conn); $store = new Auth_OpenID_MySQLStore($conn);
@ -192,7 +192,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
$form_html = preg_replace('/&/', '&amp;', $form_html); $form_html = preg_replace('/&/', '&amp;', $form_html);
// Display an error if the form markup could not be generated; // Display an error if the form markup couldn't be generated;
// otherwise, render the HTML. // otherwise, render the HTML.
if (Auth_OpenID::isFailure($form_html)) { if (Auth_OpenID::isFailure($form_html)) {
common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message)); common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message));

8
plugins/TwitterBridge/daemons/synctwitterfriends.php
View File

@ -126,7 +126,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
$conn->disconnect(); $conn->disconnect();
// XXX: Could not find a less brutal way to blow // XXX: Couldn't find a less brutal way to blow
// away a cached connection // away a cached connection
global $_DB_DATAOBJECT; global $_DB_DATAOBJECT;
@ -188,7 +188,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
if (empty($more_friends)) { if (empty($more_friends)) {
common_log(LOG_WARNING, $this->name() . common_log(LOG_WARNING, $this->name() .
" - Could not retrieve page $i " . " - Couldn't retrieve page $i " .
"of Twitter user $flink->foreign_id friends."); "of Twitter user $flink->foreign_id friends.");
continue; continue;
} else { } else {
@ -222,11 +222,11 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
if (!save_twitter_user($friend_id, $friend_name)) { if (!save_twitter_user($friend_id, $friend_name)) {
common_log(LOG_WARNING, $this-name() . common_log(LOG_WARNING, $this-name() .
" - Could not save $screen_name's friend, $friend_name."); " - Couldn't save $screen_name's friend, $friend_name.");
continue; continue;
} }
// Check to see if there is a related local user // Check to see if there's a related local user
$friend_flink = Foreign_link::getByForeignID($friend_id, $friend_flink = Foreign_link::getByForeignID($friend_id,
TWITTER_SERVICE); TWITTER_SERVICE);

8
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
View File

@ -147,7 +147,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$conn->disconnect(); $conn->disconnect();
// XXX: Could not find a less brutal way to blow // XXX: Couldn't find a less brutal way to blow
// away a cached connection // away a cached connection
global $_DB_DATAOBJECT; global $_DB_DATAOBJECT;
@ -158,7 +158,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
{ {
if (empty($flink)) { if (empty($flink)) {
common_log(LOG_WARNING, $this->name() . common_log(LOG_WARNING, $this->name() .
" - Cannot retrieve Foreign_link for foreign ID $fid"); " - Can't retrieve Foreign_link for foreign ID $fid");
return; return;
} }
@ -458,7 +458,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$profile = Profile::staticGet($profile_id); $profile = Profile::staticGet($profile_id);
if (empty($profile)) { if (empty($profile)) {
common_debug($this->name() . " - Could not get profile: $profile_id!"); common_debug($this->name() . " - Couldn't get profile: $profile_id!");
return; return;
} }
@ -537,7 +537,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$ok = file_put_contents($avatarfile, $response->getBody()); $ok = file_put_contents($avatarfile, $response->getBody());
if (!$ok) { if (!$ok) {
common_log(LOG_WARNING, $this->name() . common_log(LOG_WARNING, $this->name() .
" - Could not open file $filename"); " - Couldn't open file $filename");
return false; return false;
} }
} else { } else {

2
plugins/UserFlag/flagprofile.php
View File

@ -135,7 +135,7 @@ class FlagprofileAction extends Action
$ufp->created = common_sql_now(); $ufp->created = common_sql_now();
if (!$ufp->insert()) { if (!$ufp->insert()) {
throw new ServerException(sprintf(_("Could not flag profile '%s' with flag '%s'."), throw new ServerException(sprintf(_("Couldn't flag profile '%s' with flag '%s'."),
$this->profile->nickname, $this->flag)); $this->profile->nickname, $this->flag));
} }

2
scripts/console.php
View File

@ -90,7 +90,7 @@ function readline_emulation($prompt)
if ($retval == 0) { if ($retval == 0) {
return $line; return $line;
} elseif ($retval == 127) { } elseif ($retval == 127) {
// Could not execute bash even though we thought we saw it. // Couldn't execute bash even though we thought we saw it.
// Shell probably spit out an error message, sorry :( // Shell probably spit out an error message, sorry :(
// Fall through to fgets()... // Fall through to fgets()...
} else { } else {

4
scripts/createsim.php
View File

@ -85,7 +85,7 @@ function newSub($i)
$from = User::staticGet('nickname', $fromnick); $from = User::staticGet('nickname', $fromnick);
if (empty($from)) { if (empty($from)) {
throw new Exception("Cannot find user '$fromnick'."); throw new Exception("Can't find user '$fromnick'.");
} }
$t = rand(0, $i - 1); $t = rand(0, $i - 1);
@ -102,7 +102,7 @@ function newSub($i)
$to = User::staticGet('nickname', $tunic); $to = User::staticGet('nickname', $tunic);
if (empty($to)) { if (empty($to)) {
throw new Exception("Cannot find user '$tunic'."); throw new Exception("Can't find user '$tunic'.");
} }
subs_subscribe_to($from, $to); subs_subscribe_to($from, $to);

4
scripts/deleteuser.php
View File

@ -39,14 +39,14 @@ if (have_option('i', 'id')) {
$id = get_option_value('i', 'id'); $id = get_option_value('i', 'id');
$user = User::staticGet('id', $id); $user = User::staticGet('id', $id);
if (empty($user)) { if (empty($user)) {
print "Cannot find user with ID $id\n"; print "Can't find user with ID $id\n";
exit(1); exit(1);
} }
} else if (have_option('n', 'nickname')) { } else if (have_option('n', 'nickname')) {
$nickname = get_option_value('n', 'nickname'); $nickname = get_option_value('n', 'nickname');
$user = User::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
if (empty($user)) { if (empty($user)) {
print "Cannot find user with nickname '$nickname'\n"; print "Can't find user with nickname '$nickname'\n";
exit(1); exit(1);
} }
} else { } else {

2
scripts/fixup_utf8.php
View File

@ -76,7 +76,7 @@ class UTF8FixerUpper
$succ = mysqli_set_charset($conn, $charset); $succ = mysqli_set_charset($conn, $charset);
if (!$succ) { if (!$succ) {
echo "ERROR: Could not set charset\n"; echo "ERROR: couldn't set charset\n";
$db->disconnect(); $db->disconnect();
return NULL; return NULL;
} }

4
scripts/makegroupadmin.php
View File

@ -67,7 +67,7 @@ try {
$member->created = common_sql_now(); $member->created = common_sql_now();
if (!$member->insert()) { if (!$member->insert()) {
throw new Exception("Cannot add '$nickname' to '$groupname'."); throw new Exception("Can't add '$nickname' to '$groupname'.");
} }
} }
@ -80,7 +80,7 @@ try {
$member->is_admin = 1; $member->is_admin = 1;
if (!$member->update($orig)) { if (!$member->update($orig)) {
throw new Exception("Cannot make '$nickname' admin of '$groupname'."); throw new Exception("Can't make '$nickname' admin of '$groupname'.");
} }
} catch (Exception $e) { } catch (Exception $e) {

4
scripts/registeruser.php
View File

@ -60,7 +60,7 @@ try {
'fullname' => $fullname)); 'fullname' => $fullname));
if (empty($user)) { if (empty($user)) {
throw new Exception("Cannot register user '$nickname' with password '$password' and fullname '$fullname'."); throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'.");
} }
if (!empty($email)) { if (!empty($email)) {
@ -71,7 +71,7 @@ try {
if (!$user->updateKeys($orig)) { if (!$user->updateKeys($orig)) {
print "Failed!\n"; print "Failed!\n";
throw new Exception("Cannot update email address."); throw new Exception("Can't update email address.");
} }
} }

2
scripts/showcache.php
View File

@ -58,7 +58,7 @@ print "Checking key '$k'...\n";
$c = common_memcache(); $c = common_memcache();
if (empty($c)) { if (empty($c)) {
die("Cannot initialize cache object!\n"); die("Can't initialize cache object!\n");
} }
$obj = $c->get($k); $obj = $c->get($k);

4
scripts/sitemap.php
View File

@ -377,11 +377,11 @@ function write_file($path, $data)
} }
if (($fh_out = fopen($path,'w')) === false) { if (($fh_out = fopen($path,'w')) === false) {
error("Could not open $path for writing."); error("couldn't open $path for writing.");
} }
if (fwrite($fh_out, $data) === false) { if (fwrite($fh_out, $data) === false) {
error("Could not write to $path."); error("couldn't write to $path.");
} }
} }

2
scripts/update_translations.php
View File

@ -98,7 +98,7 @@ foreach ($languages as $language) {
$new_file = curl_get_file($file_url); $new_file = curl_get_file($file_url);
if ($new_file === FALSE) { if ($new_file === FALSE) {
echo "Could not retrieve .po file for $code: $file_url\n"; echo "Couldn't retrieve .po file for $code: $file_url\n";
continue; continue;
} }