Page MenuHomeDevCentral
Files F12314320

D3776.diff
No OneTemporary
Actions

D3776.diff
View Options

diff --git a/workspaces/src/content/help/credits.html b/workspaces/src/content/help/credits.html
--- a/workspaces/src/content/help/credits.html
+++ b/workspaces/src/content/help/credits.html
@@ -60,6 +60,6 @@
<dd>Photography by 1st Lt. Graham Ward, U.S. Army, in the public domain.</dd>
<dt><a href="https://commons.wikimedia.org/wiki/File:Rock_Mesa_obsidian_flow_in_Oregon_in_2011_%289%29.JPG">Rock Mesa obsidian flow in Oregon in 2011</a></dt>
- <dd class="description">Obsidian lava flow Rock Mesa in in Three Sisters Area, protected area Three Sisters Wilderness, Oregon, USA. 3 September 2011, 01:04:12</dd>
+ <dd class="description">Obsidian lava flow Rock Mesa in Three Sisters Area, protected area Three Sisters Wilderness, Oregon, USA. 3 September 2011, 01:04:12</dd>
<dd>Photography by <a href="https://commons.wikimedia.org/wiki/User:Chmee2">Petr Brož</a>, under <a href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons BY-SA 3.0 license</a>.</dd>
</dl>
diff --git a/workspaces/src/includes/GlobalFunctions.php b/workspaces/src/includes/GlobalFunctions.php
--- a/workspaces/src/includes/GlobalFunctions.php
+++ b/workspaces/src/includes/GlobalFunctions.php
@@ -260,7 +260,7 @@
if (array_key_exists('REDIRECT_URL', $_SERVER)) {
//With mod_rewrite, we can use REDIRECT_URL
- //We takes the end of the URL, ie *FROM* $len position
+ //We take the end of the URL, ie *FROM* $len position
return substr(get_server_url() . $_SERVER["REDIRECT_URL"], $len);
}
@@ -268,7 +268,7 @@
//If you need to edit here, use $_SERVER['REQUEST_URI']
//but you need to discard $_SERVER['QUERY_STRING']
- //We takes the end of the URL, ie *FROM* $len position
+ //We take the end of the URL, ie *FROM* $len position
$url = substr(get_server_url() . $_SERVER["REQUEST_URI"], $len);
//But if there are a query string (?action=... we need to discard it)
@@ -296,7 +296,7 @@
////////////////////////////////////////////////////////////////////////////////
/*
- * Gets an hash value to check the integrity of URLs in /do.php calls
+ * Gets a hash value to check the integrity of URLs in /do.php calls
* @param Array $args the args to compute the hash
* @return the hash paramater for your xmlHttpRequest url
*/
diff --git a/workspaces/src/includes/auth/AddToGroupUserAction.php b/workspaces/src/includes/auth/AddToGroupUserAction.php
--- a/workspaces/src/includes/auth/AddToGroupUserAction.php
+++ b/workspaces/src/includes/auth/AddToGroupUserAction.php
@@ -17,7 +17,7 @@
*/
/**
- * User action to add an user into a group
+ * User action to add a user into a group
*/
class AddToGroupUserAction extends UserAction implements ObjectDeserializable {
/**
diff --git a/workspaces/src/includes/auth/AuthenticationMethod.php b/workspaces/src/includes/auth/AuthenticationMethod.php
--- a/workspaces/src/includes/auth/AuthenticationMethod.php
+++ b/workspaces/src/includes/auth/AuthenticationMethod.php
@@ -58,7 +58,7 @@
public $canCreateUser = false;
/**
- * @var Array Actions to execute if an user is created, eacth instance a member of UserAction
+ * @var Array Actions to execute if a user is created, each instance a member of UserAction
*/
public $createUserActions = [];
@@ -95,7 +95,7 @@
/**
* Finds user from available data
*
- * @return User the user if an user has been found; otherwise, false.
+ * @return User the user if a user has been found; otherwise, false.
*/
private function findUser () {
if ($this->remoteUserId != '') {
@@ -120,7 +120,7 @@
* @return boolean true if user has been successfully logged in; otherwise, false.
*/
public function signInOrCreateUser () {
- // At this stage, if we don't already have an user instance,
+ // At this stage, if we don't already have a user instance,
// we're fetching it by remote user id or mail.
//
// If no result is returned, we're creating a new user if needed.
@@ -138,7 +138,7 @@
} else {
$this->createUser();
if ($this->localUser === null) {
- throw new Exception("Can't sign in: after correct remote authentication, an error occured creating locally a new user.");
+ throw new Exception("Can't sign in: after correct remote authentication, an error occurred creating locally a new user.");
}
}
}
@@ -157,7 +157,7 @@
}
/**
- * Creates a new user based on the authentication provisionning information
+ * Creates a new user based on the authentication provisioning information
*
* @return User The user created
*/
diff --git a/workspaces/src/includes/cache/cache.php b/workspaces/src/includes/cache/cache.php
--- a/workspaces/src/includes/cache/cache.php
+++ b/workspaces/src/includes/cache/cache.php
@@ -43,7 +43,7 @@
*
* The class cache to use will be Cache + (preference engine, capitalized)
*
- * This method will creates an instance of the specified object,
+ * This method will create an instance of the specified object,
* calling the load static method from this object class.
*
* Example:
diff --git a/workspaces/src/includes/cache/void.php b/workspaces/src/includes/cache/void.php
--- a/workspaces/src/includes/cache/void.php
+++ b/workspaces/src/includes/cache/void.php
@@ -19,7 +19,7 @@
/**
* "blackhole" void cache
*
- * This class doesn't cache information, it'a void wrapper
+ * This class doesn't cache information, it's a void wrapper
* get will always return null
* set and delete do nothing
*
diff --git a/workspaces/src/includes/collection/MySQLCollection.php b/workspaces/src/includes/collection/MySQLCollection.php
--- a/workspaces/src/includes/collection/MySQLCollection.php
+++ b/workspaces/src/includes/collection/MySQLCollection.php
@@ -85,7 +85,7 @@
///
/**
- * Initialiazes collections table
+ * Initializes collections table
*/
protected function initializeCollectionsTable () {
if (defined('COLLECTIONS_MYSQL_DATABASE_READY') && COLLECTIONS_MYSQL_DATABASE_READY) {
@@ -112,7 +112,7 @@
* Executes a SQL query
*
* @param string $sql The SQL query
- * @return mixed If the query doesn't return any result, null. If the query return a row with one field, the scalar value. Otheriwse, an aossciative array, the fields as keys, the row as values.
+ * @return mixed If the query doesn't return any result, null. If the query return a row with one field, the scalar value. Otherwise, an associative array, the fields as keys, the row as values.
*/
public function query ($sql) {
if ($sql == "") {
diff --git a/workspaces/src/includes/collection/SQLCollection.php b/workspaces/src/includes/collection/SQLCollection.php
--- a/workspaces/src/includes/collection/SQLCollection.php
+++ b/workspaces/src/includes/collection/SQLCollection.php
@@ -28,7 +28,7 @@
* Executes a SQL query
*
* @param string $sql The SQL query
- * @return mixed If the query doesn't return any null, nothing. If the query return a row with one field, the scalar value. Otheriwse, an aossciative array, the fields as keys, the row as values.
+ * @return mixed If the query doesn't return any null, nothing. If the query return a row with one field, the scalar value. Otherwise, an associative array, the fields as keys, the row as values.
*/
public abstract function query ($sql);
diff --git a/workspaces/src/includes/collection/SQLiteCollection.php b/workspaces/src/includes/collection/SQLiteCollection.php
--- a/workspaces/src/includes/collection/SQLiteCollection.php
+++ b/workspaces/src/includes/collection/SQLiteCollection.php
@@ -78,7 +78,7 @@
///
/**
- * Initializaes collections table
+ * Initializes collections table
*/
protected function initializeCollectionsTable () {
if (defined('COLLECTIONS_SQLITE_DATABASE_READY') && COLLECTIONS_SQLITE_DATABASE_READY) {
diff --git a/workspaces/src/includes/config.php b/workspaces/src/includes/config.php
--- a/workspaces/src/includes/config.php
+++ b/workspaces/src/includes/config.php
@@ -173,7 +173,7 @@
* 'Password' => 'yourpassword'
* ];
*
- * To connect to MongoDB with SSL, use the same syanx and add a SSL context as 'SSL' parameter.
+ * To connect to MongoDB with SSL, use the same syntax and add a SSL context as 'SSL' parameter.
* Documentation about SSL context is located at the following PHP documentation URL:
* http://www.php.net/manual/en/context.ssl.php
*
@@ -269,7 +269,7 @@
*
* To disable cache:
* - $Config['cache']['engine'] = 'void';
- * (or don't write nothing at all)
+ * (or omit the cache key)
*/
$Config['cache']['engine'] = 'void';
diff --git a/workspaces/src/includes/objects/user.php b/workspaces/src/includes/objects/user.php
--- a/workspaces/src/includes/objects/user.php
+++ b/workspaces/src/includes/objects/user.php
@@ -85,7 +85,7 @@
$sql = "SELECT * FROM " . TABLE_USERS . " WHERE user_id = '" . $this->id . "'";
if ( !($result = $db->sql_query($sql)) ) message_die(SQL_ERROR, "Unable to query users", '', __LINE__, __FILE__, $sql);
if (!$row = $db->sql_fetchrow($result)) {
- $this->lastError = "User unkwown: " . $this->id;
+ $this->lastError = "User unknown: " . $this->id;
return false;
}
@@ -183,7 +183,7 @@
* Checks if a login is available
*
* @param string $login the login to check
- * @return boolean true if the login is avaiable; otherwise, false.
+ * @return boolean true if the login is available; otherwise, false.
*/
public static function is_available_login ($login) {
global $db;
@@ -239,7 +239,7 @@
* Gets user from remote identity provider identifiant
*
* @param $authType The authentication method type
- * @param $remoteUserId The remote user idenfifiant
+ * @param $remoteUserId The remote user identifier
* @return User the user matching the specified identity provider and identifiant; null if no user were found.
*/
public static function getUserFromRemoteIdentity ($authType, $remoteUserId) {
@@ -264,7 +264,7 @@
* Sets user's remote identity provider identifiant
*
* @param $authType The authentication method type
- * @param $remoteUserId The remote user idenfifiant
+ * @param $remoteUserId The remote user identifier
* */
public function setRemoteIdentity ($authType, $remoteUserId, $properties = null) {
global $db;
@@ -332,7 +332,7 @@
}
/**
- * Gets workspaces this user has accces to.
+ * Gets workspaces this user has access to.
*
* @return Array A list of workspaces
*/
@@ -376,7 +376,7 @@
}
/**
- * Gets the groups where an user has access to.
+ * Gets the groups where a user has access to.
*
* @param int $user_id the user to get the groups list
* @return array an array containing group_id, matching groups the specified user has access to.
diff --git a/workspaces/src/includes/objects/usergroup.php b/workspaces/src/includes/objects/usergroup.php
--- a/workspaces/src/includes/objects/usergroup.php
+++ b/workspaces/src/includes/objects/usergroup.php
@@ -67,7 +67,7 @@
$sql = "SELECT * FROM " . TABLE_UGROUPS . " WHERE group_id = '" . $id . "'";
if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Unable to query users_groups", '', __LINE__, __FILE__, $sql);
if (!$row = $db->sql_fetchrow($result)) {
- $this->lastError = "UserGroup unkwown: " . $this->id;
+ $this->lastError = "UserGroup unknown: " . $this->id;
return false;
}
$this->load_from_row($row);
@@ -86,7 +86,7 @@
$sql = "SELECT * FROM " . TABLE_UGROUPS . " WHERE group_code = '" . $code . "'";
if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Unable to query group", '', __LINE__, __FILE__, $sql);
if (!$row = $db->sql_fetchrow($result)) {
- throw new Exception("Group unkwown: " . $code);
+ throw new Exception("Group unknown: " . $code);
}
$instance = new static();
diff --git a/workspaces/src/includes/session.php b/workspaces/src/includes/session.php
--- a/workspaces/src/includes/session.php
+++ b/workspaces/src/includes/session.php
@@ -215,14 +215,14 @@
* This method is to be called when an event implies a session destroy
*/
public function clean () {
- //Destroies $_SESSION array values, help ID
+ //Destroys $_SESSION array values, help ID
foreach ($_SESSION as $key => $value) {
if ($key != 'ID') unset($_SESSION[$key]);
}
}
/**
- * Updates the session in an user login context
+ * Updates the session in a user login context
*
* @param string $user_id the user ID
*/
@@ -238,7 +238,7 @@
}
/**
- * Updates the session in an user logout context
+ * Updates the session in a user logout context
*/
public function user_logout () {
global $db;
diff --git a/workspaces/src/includes/workspaces/Workspace.php b/workspaces/src/includes/workspaces/Workspace.php
--- a/workspaces/src/includes/workspaces/Workspace.php
+++ b/workspaces/src/includes/workspaces/Workspace.php
@@ -78,7 +78,7 @@
$sql = "SELECT * FROM " . TABLE_WORKSPACES . " WHERE workspace_code = '" . $code . "'";
if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Unable to query workspaces", '', __LINE__, __FILE__, $sql);
if (!$row = $db->sql_fetchrow($result)) {
- throw new Exception("Workspace unkwown: " . $code);
+ throw new Exception("Workspace unknown: " . $code);
}
$workspace = new Workspace();
@@ -95,7 +95,7 @@
$sql = "SELECT * FROM " . TABLE_WORKSPACES . " WHERE workspace_id = '" . $id . "'";
if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Unable to query workspaces", '', __LINE__, __FILE__, $sql);
if (!$row = $db->sql_fetchrow($result)) {
- $this->lastError = "Workspace unkwown: " . $this->id;
+ $this->lastError = "Workspace unknown: " . $this->id;
return false;
}
$this->load_from_row($row);
diff --git a/workspaces/src/includes/workspaces/WorkspaceConfiguration.php b/workspaces/src/includes/workspaces/WorkspaceConfiguration.php
--- a/workspaces/src/includes/workspaces/WorkspaceConfiguration.php
+++ b/workspaces/src/includes/workspaces/WorkspaceConfiguration.php
@@ -44,7 +44,7 @@
/**
* Determines if internal Obsidian Workspaces authentication can be used to login on this workspace URL
*
- * @return boolean True if an user not logged in Obsidian Workspaces going to a workspace URL should be offered to login through Obsidian ; otherwise, false.
+ * @return boolean True if a user not logged in Obsidian Workspaces going to a workspace URL should be offered to login through Obsidian ; otherwise, false.
*/
public $allowInternalAuthentication = true;
@@ -70,7 +70,7 @@
}
/**
- * Determines if the URL fragment matches a controller binded to it.
+ * Determines if the URL fragment matches a controller bound to it.
*
* @param ApplicationConfiguration $applicationConfiguration The application configuration
* @return boolean true if the URL fragment matches an application controller's bind
diff --git a/workspaces/src/index.php b/workspaces/src/index.php
--- a/workspaces/src/index.php
+++ b/workspaces/src/index.php
@@ -99,7 +99,7 @@
}
}
- //Not a workspace, nor a controller toponomy
+ //Not a workspace, nor a controller toponym
ErrorPageController::show($context, 404);
exit;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 07:48 (13 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3098238
Default Alt Text
D3776.diff (15 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator