supernova-ws / SuperNova

notes.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
 
 use Vector\Vector;
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 lng_include('notes');
 
 global $user;
@@ -18,15 +18,15 @@ 
 $template = gettemplate('notes', true);
 
 $result = array();
-if(($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => classLocale::$lang[$result_message]);
 }
 
 $note_id_edit = sys_get_param_id('note_id_edit');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     DBStaticNote::processDelete($user, $note_id_edit);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -34,7 +34,7 @@ 
       'MESSAGE' => classLocale::$lang[$e->getMessage()],
     );
   }
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
   $note_title == db_escape(classLocale::$lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == db_escape(classLocale::$lang['note_new_text']) ? $note_text = '' : false;
 
@@ -43,7 +43,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), Vector::$knownSystems));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), Vector::$knownPlanets + 1));
 
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
       throw new exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -52,15 +52,15 @@ 
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
 
     sn_db_transaction_start();
-    if($note_id_edit) {
+    if ($note_id_edit) {
       $check_note_id = DBStaticNote::db_note_get_id_and_owner($note_id_edit);
-      if(!$check_note_id) {
+      if (!$check_note_id) {
         throw new Exception('note_err_note_not_found', ERR_ERROR);
       }
     }
 
-    if($note_id_edit) {
-      if($check_note_id['owner'] != $user['id']) {
+    if ($note_id_edit) {
+      if ($check_note_id['owner'] != $user['id']) {
         throw new Exception('note_err_owner_wrong', ERR_ERROR);
       }
 
@@ -70,9 +70,9 @@ 
     }
 
     sn_db_transaction_commit();
-    sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
+    sys_redirect('notes.php?STATUS='.ERR_NONE.'&MESSAGE='.($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -82,7 +82,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   note_assign($template, array(
     'id'          => 0,
     'time'        => SN_TIME_NOW,
@@ -95,13 +95,13 @@ 
 
 $note_exist = false;
 $notes_query = DBStaticNote::db_note_list_by_owner($user['id']);
-while($note_row = db_fetch($notes_query)) {
+while ($note_row = db_fetch($notes_query)) {
   note_assign($template, $note_row);
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
 }
 $note_id_edit = $note_exist ? $note_id_edit : 0;
 
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
   $template->assign_block_vars('note_priority', array(
     'ID'    => $note_priority_id,
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -109,14 +109,14 @@ 
   ));
 }
 
-foreach(classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach (classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
   $template->assign_block_vars('planet_type', array(
     'ID'   => $planet_type_id,
     'TEXT' => $planet_type_string,
   ));
 }
 
-foreach($result as $result_data) {
+foreach ($result as $result_data) {
   $template->assign_block_vars('result', $result_data);
 }
 

includes/classes/DBRow.php

Spacing +11 added lines, -11 removed lines

@@ -86,7 +86,7 @@ 
    * @param db_mysql|null $db
    */
   public static function setDb($db = null) {
-    if(empty($db) || !($db instanceof db_mysql)) {
+    if (empty($db) || !($db instanceof db_mysql)) {
       $db = null;
     }
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -149,7 +149,7 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
     if ($dbId <= 0) {
-      classSupernova::$debug->error(get_called_class() . '::' . __METHOD__ . ' $dbId not positive = ' . $dbId);
+      classSupernova::$debug->error(get_called_class().'::'.__METHOD__.' $dbId not positive = '.$dbId);
 
       return;
     }
@@ -161,7 +161,7 @@ 
       $this->dbGetLockById($this->_dbId);
     }
 
-    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;");
+    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;");
     if (empty($db_row)) {
       return;
     }
@@ -193,7 +193,7 @@ 
     if ($this->isNew()) {
       // No DB_ID - new unit
       if ($this->isEmpty()) {
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
       }
       $this->dbInsert();
     } else {
@@ -202,7 +202,7 @@ 
         $this->dbDelete();
       } else {
         if (!sn_db_transaction_check(false)) {
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
         }
         $this->dbUpdate();
       }
@@ -230,12 +230,12 @@ 
   // TODO - protected
   public function dbInsert() {
     if (!$this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
     }
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
 
     if (empty($this->_dbId)) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
     }
 
     return $this->_dbId;
@@ -248,7 +248,7 @@ 
   public function dbUpdate() {
     // TODO - Update
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldSet(true));
   }
@@ -259,7 +259,7 @@ 
   // TODO - protected
   public function dbDelete() {
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
     }
     classSupernova::$gc->db->doDeleteRowWhere(static::$_table, array(static::$_dbIdFieldName => $this->_dbId));
     $this->_dbId = 0;
@@ -414,7 +414,7 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $result = 0;
-    if (classSupernova::$db->doInsert("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
+    if (classSupernova::$db->doInsert("INSERT INTO `{{".static::$_table."}}` ({$fields}) VALUES ({$values});")) {
       $result = classSupernova::$db->db_insert_id();
     }
 
@@ -450,7 +450,7 @@ 
 
     return empty($set_string)
       ? true
-      : classSupernova::$db->doUpdate("UPDATE `{{" . static::$_table . "}}` SET {$set_string} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
+      : classSupernova::$db->doUpdate("UPDATE `{{".static::$_table."}}` SET {$set_string} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
   }
 
 }

includes/classes/DbRowDirectOperator.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
       ->setIdField($entity->getIdFieldName())
       ->field('*')
       ->from($entity->getTableName())
-      ->where($entity->getIdFieldName() . ' = "' . $entity->dbId . '"');
+      ->where($entity->getIdFieldName().' = "'.$entity->dbId.'"');
 
     return $stmt->selectRow();
   }
@@ -43,8 +43,8 @@ 
     $query = array();
     foreach ($entity->exportRowWithoutId() as $fieldName => $fieldValue) {
       // TODO: MORE type detection
-      if(!is_numeric($fieldValue)) {
-        $fieldValue = "'" . $db->db_escape($fieldValue) . "'";
+      if (!is_numeric($fieldValue)) {
+        $fieldValue = "'".$db->db_escape($fieldValue)."'";
       }
       $query[] = "`{$fieldName}` = {$fieldValue}";
     }
@@ -55,7 +55,7 @@ 
       return 0;
     }
 
-    $db->doInsert("INSERT INTO `{{" . $entity->getTableName() . "}}` SET " . $query);
+    $db->doInsert("INSERT INTO `{{".$entity->getTableName()."}}` SET ".$query);
 
     // TODO Exceptiion if db_insert_id() is empty
     return $entity->dbId = $db->db_insert_id();

admin/adm_message_list.php

Spacing +12 added lines, -12 removed lines

@@ -12,9 +12,9 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -28,8 +28,8 @@ 
   ),
 );
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
-foreach(DBStaticMessages::$snMessageClassList as $key => $value) {
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
+foreach (DBStaticMessages::$snMessageClassList as $key => $value) {
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
     continue;
   }
 
@@ -41,21 +41,21 @@ 
 
 
 $deletedMessages = '';
-if($idMessageDelete = sys_get_param_id('msg_del')) {
+if ($idMessageDelete = sys_get_param_id('msg_del')) {
   DBStaticMessages::db_message_delete_by_id($idMessageDelete);
   $deletedMessages = $idMessageDelete;
-} elseif(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
+} elseif (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
   $message_delete = implode(', ', $message_delete);
   DBStaticMessages::db_message_list_delete_set($message_delete);
   $deletedMessages = $message_delete;
 }
 
-if($deletedMessages) {
+if ($deletedMessages) {
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted'], $deletedMessages)));
 }
 
 
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
   $delete_date = "{$year}-{$month}-{$day}";
   DBStaticMessages::db_message_list_delete_by_date($delete_date, $int_type_selected);
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted_date'], $allowed_types[$int_type_selected]['TEXT'], $delete_date)));
@@ -67,13 +67,13 @@ 
 
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
 
-if(sys_get_param('page_prev') && $int_page_current > 1) {
+if (sys_get_param('page_prev') && $int_page_current > 1) {
   $int_page_current--;
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
   $int_page_current++;
 }
 
-for($i = 1; $i <= $page_max; $i++) {
+for ($i = 1; $i <= $page_max; $i++) {
   $template->assign_block_vars('page', array('NUMBER' => $i));
 }
 
@@ -81,7 +81,7 @@ 
 $StartRec = ($int_page_current - 1) * 25;
 
 $Messages = DBStaticMessages::db_message_list_admin_by_type($int_type_selected, $StartRec);
-while($row = db_fetch($Messages)) {
+while ($row = db_fetch($Messages)) {
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
   $row['TEXT'] = nl2br($row['TEXT']);