supernova-ws / SuperNova

announce.php

Spacing +15 added lines, -15 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 $allow_anonymous = true;
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $config;
 
@@ -23,40 +23,40 @@ 
 $mode = sys_get_param_str('mode');
 
 $announce = array();
-if($user['authlevel'] >= 3) {
-  if(!empty($text)) {
+if ($user['authlevel'] >= 3) {
+  if (!empty($text)) {
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
 
-    if($mode == 'edit') {
+    if ($mode == 'edit') {
       DBStaticNews::db_news_update_set($announce_time, $text, $detail_url, $announce_id);
       DBStaticSurvey::db_survey_delete_by_id($announce_id);
     } else {
       DBStaticNews::db_news_insert_set($announce_time, $text, $detail_url, $user);
       $announce_id = db_insert_id();
     }
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
       $survey_answers = explode("\r\n", $survey_answers);
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
       DBStaticSurvey::db_survey_insert($announce_id, $survey_question, $survey_until);
       $survey_id = db_insert_id();
-      foreach($survey_answers as $survey_answer) {
+      foreach ($survey_answers as $survey_answer) {
         $survey_answer = db_escape(trim($survey_answer));
-        if(empty($survey_answer)) {
+        if (empty($survey_answer)) {
           continue;
         }
         DBStaticSurveyAnswer::db_survey_answer_insert($survey_id, $survey_answer);
       }
     }
 
-    if($announce_time <= SN_TIME_NOW) {
-      if($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
+    if ($announce_time <= SN_TIME_NOW) {
+      if ($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
         $config->db_saveItem('var_news_last', $announce_time);
       }
 
-      if(sys_get_param_int('news_mass_mail')) {
-        $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang['news_more']}</span></a>" : '');
+      if (sys_get_param_int('news_mass_mail')) {
+        $text = sys_get_param('text').($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang['news_more']}</span></a>" : '');
         msg_send_simple_message('*', 0, 0, MSG_TYPE_ADMIN, $lang['sys_administration'], $lang['news_title'], $text);
       }
     }
@@ -66,7 +66,7 @@ 
   }
 
   $survey_answers = '';
-  switch($mode) {
+  switch ($mode) {
     case 'del':
       DBStaticNews::db_news_delete_by_id($announce_id);
       $mode = '';
@@ -76,9 +76,9 @@ 
       $template->assign_var('ID', $announce_id);
     case 'copy':
       $announce = DBStaticNews::db_news_with_survey_select_by_id($announce_id);
-      if($announce['survey_id']) {
+      if ($announce['survey_id']) {
         $query = DBStaticSurveyAnswer::db_survey_answer_text_select_by_news($announce);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $survey_answers[] = $row['survey_answer_text'];
         }
         $survey_answers = implode("\r\n", $survey_answers);
@@ -86,7 +86,7 @@ 
     break;
   }
 } else {
-  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= ' . SN_TIME_NOW;
+  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= '.SN_TIME_NOW;
 }
 
 nws_render($template, $annQuery, 20);

includes/classes/DBStaticNote.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
    * @param $note_id_edit
    */
   public static function db_note_update_by_id($note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky, $note_id_edit) {
-    doquery("UPDATE {{notes}} SET `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    doquery("UPDATE {{notes}} SET `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky}
         WHERE `id` = {$note_id_edit} LIMIT 1;");
   }
@@ -53,7 +53,7 @@ 
    * @param $note_sticky
    */
   public static function db_note_insert($user, $note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky) {
-    doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky};");
   }
 

includes/classes/ExceptionDbSqlWhereNotAnArray.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
 
-class ExceptionDbSqlWhereNotAnArray extends Exception{
+class ExceptionDbSqlWhereNotAnArray extends Exception {
 
 }

includes/classes/DBStaticRecord.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
   }
 
   /**
-   * @param int|string  $recordId
-   * @param mixed|array $fieldList
+   * @param integer  $recordId
+   * @param string[] $fieldList
    * @param bool        $forUpdate
    *
    * @return array|null

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
    */
   public static function getRecordById($recordId, $fieldList = '*', $forUpdate = false) {
 //    return static::getRecord(array(static::$_idField => $recordId), $fieldList, $forUpdate);
-    return static::getRecord(array(static::$_idField . '=' . $recordId), $fieldList, $forUpdate);
+    return static::getRecord(array(static::$_idField.'='.$recordId), $fieldList, $forUpdate);
   }
 
 
@@ -84,7 +84,7 @@ 
         DbSqlStatement::build(null, get_called_class())
           ->select()
           ->fields(static::$_idField)
-          ->where(array("`" . static::$_idField . "` IN (" . implode(',', $idList) . ")"))
+          ->where(array("`".static::$_idField."` IN (".implode(',', $idList).")"))
       );
     }
 

includes/classes/DbSqlStatement.php

Spacing +11 added lines, -11 removed lines

@@ -174,7 +174,7 @@ 
   // TODO - fields should be escaped !!
   // TODO - $where should be validated and checked!
   public function where($where = array()) {
-    if(!is_array($where)) {
+    if (!is_array($where)) {
       throw new ExceptionDbSqlWhereNotAnArray();
     }
     $this->where = $where;
@@ -209,24 +209,24 @@ 
     $result = '';
     $result .= $this->stringEscape($this->operation);
 
-    $result .= ' ' . $this->selectFieldsToString($this->fields);
+    $result .= ' '.$this->selectFieldsToString($this->fields);
 
     $result .= ' FROM';
-    $result .= ' `{{' . $this->stringEscape($this->table) . '}}`';
-    $result .= !empty($this->alias) ? ' AS `' . $this->stringEscape($this->alias) . '`' : '';
+    $result .= ' `{{'.$this->stringEscape($this->table).'}}`';
+    $result .= !empty($this->alias) ? ' AS `'.$this->stringEscape($this->alias).'`' : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->where) ? ' WHERE ' . implode(' AND ', $this->where) : '';
+    $result .= !empty($this->where) ? ' WHERE '.implode(' AND ', $this->where) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->group) ? ' GROUP BY ' . implode(',', $this->group) : '';
+    $result .= !empty($this->group) ? ' GROUP BY '.implode(',', $this->group) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->order) ? ' ORDER BY ' . implode(',', $this->order) : '';
+    $result .= !empty($this->order) ? ' ORDER BY '.implode(',', $this->order) : '';
 
     // TODO - fields should be escaped !!
     // TODO - separate offset and row_count
-    $result .= !empty($this->limit) ? ' LIMIT ' . implode(' OFFSET ', $this->limit) : '';
+    $result .= !empty($this->limit) ? ' LIMIT '.implode(' OFFSET ', $this->limit) : '';
 
     // TODO - protect from double escape!
 
@@ -264,7 +264,7 @@ 
    */
   protected function processField($fieldName) {
     if (is_bool($fieldName)) {
-      $result = (string)intval($fieldName);
+      $result = (string) intval($fieldName);
     } elseif (is_null($fieldName)) {
       $result = 'NULL';
     } elseif ($fieldName === '*') {
@@ -282,7 +282,7 @@ 
    * @return string
    */
   protected function processFieldDefault($fieldName) {
-    $result = (string)$fieldName;
+    $result = (string) $fieldName;
     if (
       $result != ''
       &&
@@ -296,7 +296,7 @@ 
       !is_numeric($fieldName)
     ) {
       // Other should be formatted
-      $result = '`' . $this->stringEscape($result) . '`';
+      $result = '`'.$this->stringEscape($result).'`';
     }
 
     return $result;