BurningFlipside / CommonCode

Settings.php

Indentation +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         {
             require $GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php';
             return;
-	}
+    }
         if(file_exists('/var/www/secure_settings/class.FlipsideSettings.php'))
         {
             require '/var/www/secure_settings/class.FlipsideSettings.php';
@@ -72,7 +72,7 @@ 
     public function getDataSetData($dataSetName)
     {
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
-	{
+    {
             return false;
         }
         return \FlipsideSettings::$dataset[$dataSetName];

Data/SQLDataSet.php

Spacing +2 added lines, -2 removed lines

@@ -254,7 +254,7 @@ 
         $stmt = $this->pdo->query($sql);
         if($stmt === false)
         {
-            if (php_sapi_name() !== "cli") {
+            if(php_sapi_name() !== "cli") {
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;
@@ -304,7 +304,7 @@ 
         $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);";
         if($this->pdo->exec($sql) === false)
         {
-            if (php_sapi_name() !== "cli") {
+            if(php_sapi_name() !== "cli") {
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;

Braces +4 added lines, -2 removed lines

@@ -254,7 +254,8 @@ 
         $stmt = $this->pdo->query($sql);
         if($stmt === false)
         {
-            if (php_sapi_name() !== "cli") {
+            if (php_sapi_name() !== "cli")
+            {
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;
@@ -304,7 +305,8 @@ 
         $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);";
         if($this->pdo->exec($sql) === false)
         {
-            if (php_sapi_name() !== "cli") {
+            if (php_sapi_name() !== "cli")
+            {
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;

Auth/SQLGroup.php

Indentation +3 added lines, -3 removed lines

@@ -137,16 +137,16 @@
     {
         if($isGroup)
         {
-        	array_push($this->tmpMembers, array('gid' => $name));
+            array_push($this->tmpMembers, array('gid' => $name));
         }
         else
         {
-        	array_push($this->tmpMembers, array('uid' => $name));
+            array_push($this->tmpMembers, array('uid' => $name));
         }
         if($flush)
         {
                 $gid = $this->getGroupName();
-        	$memberDT = $this->auth->getDataTable('groupUserMap');
+            $memberDT = $this->auth->getDataTable('groupUserMap');
                 //Get all cu rrent direct members
                 $existing = $memberDT->read(new \Flipside\Data\Filter('groupCN eq "'.$gid.'"'));
                 $exCount = count($existing);

Auth/SQLUser.php

Indentation +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         $data = $userDT->read($filter);
         if(strlen($data[0]['userPassword']) === 0)
         {
-             $data[0]['userPassword'] = openssl_random_pseudo_bytes(10);
+                $data[0]['userPassword'] = openssl_random_pseudo_bytes(10);
         }
         $hash = hash('sha512', $data[0]['uid'].';'.$data[0]['userPassword'].';'.$data[0]['mail']);
         $update = array('resetHash' => $hash);

Auth/SQLAuthenticator.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
     private function hashLDAPPassword($password, $salt)
     {
         $shaHashed = sha1($password.$salt);
-        $packed = pack("H*",$shaHashed);
+        $packed = pack("H*", $shaHashed);
         $encoded = base64_encode($packed.$salt);
         return "{SSHA}".$encoded;
     }

Braces +2 added lines, -1 removed lines

@@ -219,7 +219,8 @@
     public function getGroupByName($name)
     {
         $group = $this->getEntityByFilter('group', "cn eq '$name'", '\Flipside\Auth\SQLGroup');
-        if($group === null) {
+        if($group === null)
+        {
             return $this->getEntityByFilter('group', "gid eq '$name'", '\Flipside\Auth\SQLGroup');
         }
         return $group;

Autoload.php

Spacing +8 added lines, -8 removed lines

@@ -8,22 +8,22 @@ 
 * @copyright Copyright (c) 2015, Austin Artistic Reconstruction
 * @license http://www.apache.org/licenses/ Apache 2.0 License
 */
-if(file_exists(__DIR__ . '/vendor/autoload.php'))
+if(file_exists(__DIR__.'/vendor/autoload.php'))
 {
-    require(__DIR__ . '/vendor/autoload.php');
+    require(__DIR__.'/vendor/autoload.php');
 }
-set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
-spl_autoload_register(function ($class) {
+set_include_path(get_include_path().PATH_SEPARATOR.__DIR__);
+spl_autoload_register(function($class) {
 
     // project-specific namespace prefix
     $prefix = 'Flipside\\';
 
     // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/';
+    $base_dir = __DIR__.'/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
-    if (strncmp($prefix, $class, $len) !== 0) {
+    if(strncmp($prefix, $class, $len) !== 0) {
         // no, move to the next registered autoloader
         return;
     }
@@ -34,10 +34,10 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
 
     // if the file exists, require it
-    if (file_exists($file)) {
+    if(file_exists($file)) {
         require $file;
     }
 });

Braces +6 added lines, -3 removed lines

@@ -13,7 +13,8 @@ 
     require(__DIR__ . '/vendor/autoload.php');
 }
 set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
-spl_autoload_register(function ($class) {
+spl_autoload_register(function ($class)
+{
 
     // project-specific namespace prefix
     $prefix = 'Flipside\\';
@@ -23,7 +24,8 @@ 
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
-    if (strncmp($prefix, $class, $len) !== 0) {
+    if (strncmp($prefix, $class, $len) !== 0)
+    {
         // no, move to the next registered autoloader
         return;
     }
@@ -37,7 +39,8 @@ 
     $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
 
     // if the file exists, require it
-    if (file_exists($file)) {
+    if (file_exists($file))
+    {
         require $file;
     }
 });