supernova-ws / SuperNova

includes/classes/DBStaticUnit.php

Doc Comments +6 added lines

@@ -56,6 +56,9 @@ 
     WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
   }
 
+  /**
+   * @param string $set
+   */
   public static function db_unit_set_by_id($unit_id, $set) {
     return classSupernova::db_upd_record_by_id(LOC_UNIT, $unit_id, $set);
   }
@@ -69,6 +72,9 @@ 
     return classSupernova::db_ins_record(LOC_UNIT, $set);
   }
 
+  /**
+   * @param integer $unit_location_type
+   */
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
       "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" .

Spacing +14 added lines, -14 removed lines

@@ -21,13 +21,13 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = doquery(
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
       'GROUP BY `unit_snid`'
     );
     $result = array();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['unit_snid']] = $row;
     }
 
@@ -43,8 +43,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
-      " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
+      " LIMIT 1".
       ($for_update ? ' FOR UPDATE' : '')
       , true);
   }
@@ -53,7 +53,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return doquery("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
   }
 
   public static function db_unit_set_by_id($unit_id, $set) {
@@ -71,9 +71,9 @@ 
 
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
-      "`unit_location_type` = {$unit_location_type}" .
-      ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '') .
-      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
+      "`unit_location_type` = {$unit_location_type}".
+      ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '').
+      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
       ($unit_snid = idval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : ''));
   }
 
@@ -81,7 +81,7 @@ 
     return doquery(
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
     );
   }
@@ -93,15 +93,15 @@ 
 
 
   public static function db_unit_list_admin_delete_mercenaries_finished() {
-    return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ") AND unit_type = " . UNIT_MERCENARIES);
+    return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.") AND unit_type = ".UNIT_MERCENARIES);
   }
 
   public static function db_unit_list_admin_set_mercenaries_expire_time($default_length) {
     return doquery(
       "UPDATE {{unit}}
     SET
-      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW . "),
-      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length) . ")
+      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW."),
+      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length).")
     WHERE unit_type = " . UNIT_MERCENARIES
     );
   }

includes/classes/DBStaticAlly.php

Doc Comments +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
   }
 
   /**
-   * @param $ranklist
+   * @param string $ranklist
    * @param $user
    */
   public static function db_ally_update_ranklist($ranklist, $user) {

Spacing +5 added lines, -5 removed lines

@@ -66,9 +66,9 @@ 
     `ally_name` = '{$ally_name}',
     `ally_tag` = '{$ally_tag}',
     `ally_owner` = '{$user['id']}',
-    `ally_owner_range` = '" . classLocale::$lang['ali_leaderRank'] . "',
+    `ally_owner_range` = '".classLocale::$lang['ali_leaderRank']."',
     `ally_members` = 1,
-    `ranklist` = '" . classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0',
+    `ranklist` = '" . classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0',
     `ally_register_time`= " . SN_TIME_NOW
     );
   }
@@ -87,7 +87,7 @@ 
    * @param $POST_text
    */
   public static function db_ally_request_insert($user, $id_ally, $POST_text) {
-    doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=" . SN_TIME_NOW . ";");
+    doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=".SN_TIME_NOW.";");
   }
 
   /**
@@ -137,7 +137,7 @@ 
    * @param $ally
    */
   public static function db_ally_update_by_changeset($ally_changeset, $ally) {
-    doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
+    doquery("UPDATE {{alliance}} SET ".implode(',', $ally_changeset)." WHERE `id`='{$ally['id']}' LIMIT 1;");
   }
 
   /**
@@ -248,7 +248,7 @@ 
    * @param $d
    */
   public static function db_ally_request_deny($d) {
-    doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '" . classLocale::$lang['ali_req_deny_reason'] . "' WHERE `id_user`= {$d} LIMIT 1;");
+    doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '".classLocale::$lang['ali_req_deny_reason']."' WHERE `id_user`= {$d} LIMIT 1;");
   }
 
   /**

includes/classes/DBStaticChat.php

Doc Comments +3 added lines, -3 removed lines

@@ -19,9 +19,9 @@ 
 
   /**
    * @param $user_id
-   * @param $nick
+   * @param string $nick
    * @param $ally_id
-   * @param $message
+   * @param string $message
    * @param $chat_message_sender_name
    * @param $chat_message_recipient_id
    * @param $chat_message_recipient_name
@@ -57,7 +57,7 @@ 
    * @param $alliance
    * @param $where_add
    * @param $start_row
-   * @param $page_limit
+   * @param integer $page_limit
    *
    * @return array|bool|mysqli_result|null
    */

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
       JOIN {{users}} AS u ON u.id = cp.chat_player_player_id
     WHERE
       `chat_player_refresh_last` >= '{$sql_date}'
-      AND (`banaday` IS NULL OR `banaday` <= " . SN_TIME_NOW . ")
+      AND (`banaday` IS NULL OR `banaday` <= ".SN_TIME_NOW.")
       {$ally_add}
     ORDER BY authlevel DESC, `username`");
   }
@@ -35,7 +35,7 @@ 
           `user` = '{$nick}',
           `ally_id` = '{$ally_id}',
           `message` = '{$message}',
-          `timestamp` = " . SN_TIME_NOW . ",
+          `timestamp` = ".SN_TIME_NOW.",
           `chat_message_sender_name` = '{$chat_message_sender_name}',
           `chat_message_recipient_id` = {$chat_message_recipient_id},
           `chat_message_recipient_name` = '{$chat_message_recipient_name}'"
@@ -141,7 +141,7 @@ 
    * @param $user
    */
   public static function db_chat_player_update($user) {
-    doquery("UPDATE {{chat_player}} SET `chat_player_refresh_last` = " . SN_TIME_NOW . " WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;");
+    doquery("UPDATE {{chat_player}} SET `chat_player_refresh_last` = ".SN_TIME_NOW." WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;");
   }
 
 
@@ -212,7 +212,7 @@ 
    * @param $user
    */
   public static function db_chat_player_update_activity($user) {
-    doquery("UPDATE {{chat_player}} SET `chat_player_activity` = '" . classSupernova::$db->db_escape(SN_TIME_SQL) . "' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1");
+    doquery("UPDATE {{chat_player}} SET `chat_player_activity` = '".classSupernova::$db->db_escape(SN_TIME_SQL)."' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1");
   }
 
 }
\ No newline at end of file

includes/classes/DBStaticFleetACS.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 
 
   /**
-   * @param $fleet_group_id_list
+   * @param string $fleet_group_id_list
    */
   public static function db_acs_delete_by_list($fleet_group_id_list) {
     doquery("DELETE FROM {{aks}} WHERE `id` IN ({$fleet_group_id_list})");

Spacing +10 added lines, -10 removed lines

@@ -51,16 +51,16 @@
    */
   public static function db_acs_insert($fleetid, $user, $objFleet) {
     doquery("INSERT INTO {{aks}} SET
-          `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'] . $fleetid) . "',
-          `teilnehmer` = '" . $user['id'] . "',
-          `flotten` = '" . $fleetid . "',
-          `ankunft` = '" . $objFleet->time_arrive_to_target . "',
-          `galaxy` = '" . $objFleet->fleet_end_galaxy . "',
-          `system` = '" . $objFleet->fleet_end_system . "',
-          `planet` = '" . $objFleet->fleet_end_planet . "',
-          `planet_type` = '" . $objFleet->fleet_end_type . "',
-          `eingeladen` = '" . $user['id'] . "',
-          `fleet_end_time` = '" . $objFleet->time_return_to_source . "'");
+          `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'].$fleetid)."',
+          `teilnehmer` = '" . $user['id']."',
+          `flotten` = '" . $fleetid."',
+          `ankunft` = '" . $objFleet->time_arrive_to_target."',
+          `galaxy` = '" . $objFleet->fleet_end_galaxy."',
+          `system` = '" . $objFleet->fleet_end_system."',
+          `planet` = '" . $objFleet->fleet_end_planet."',
+          `planet_type` = '" . $objFleet->fleet_end_type."',
+          `eingeladen` = '" . $user['id']."',
+          `fleet_end_time` = '" . $objFleet->time_return_to_source."'");
   }
 
   /**

includes/classes/DBStaticNews.php

Doc Comments +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@
   }
 
   /**
-   * @param $template
-   * @param $query_where
-   * @param $query_limit
+   * @param template $template
+   * @param string $query_where
+   * @param integer $query_limit
    *
    * @return array|bool|mysqli_result|null
    */

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 function db_news_insert_set($announce_time, $text, $detail_url, $user) {
   doquery("INSERT INTO {{announce}}
         SET `tsTimeStamp` = FROM_UNIXTIME({$announce_time}), `strAnnounce`='{$text}', detail_url = '{$detail_url}',
-        `user_id` = {$user['id']}, `user_name` = '" . db_escape($user['username']) . "'");
+        `user_id` = {$user['id']}, `user_name` = '".db_escape($user['username'])."'");
 }
 
 function db_survey_insert($announce_id, $survey_question, $survey_until) {
@@ -93,7 +93,7 @@ 
       LEFT JOIN {{survey}} AS s ON s.survey_announce_id = a.idAnnounce
       LEFT JOIN {{users}} AS u ON u.id = a.user_id
     {$query_where}
-    ORDER BY `tsTimeStamp` DESC, idAnnounce" .
+    ORDER BY `tsTimeStamp` DESC, idAnnounce".
     ($query_limit ? " LIMIT {$query_limit}" : ''));
 
   $template->assign_var('NEWS_COUNT', db_num_rows($announce_list));

includes/classes/DBStaticSurveyVote.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
    * @param $user
    * @param $survey_id
    * @param $survey_vote_id
-   * @param $user_name_safe
+   * @param string $user_name_safe
    */
   public static function db_survey_vote_insert(&$user, $survey_id, $survey_vote_id, $user_name_safe) {
     doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';");

includes/classes/DBStaticFleetMissile.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @return array|bool|mysqli_result|null
    */
   public static function db_missile_list_by_arrival() {
-    $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;");
+    $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= ".SN_TIME_NOW." FOR UPDATE;");
 
     return $iraks;
   }

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/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 +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
    * @return array|null
    */
   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);
   }
 
   /**
@@ -104,7 +104,7 @@ 
       $query = static::selectIterator(
         static::buildSelect()
           ->fields(static::$_idField)
-          ->where(array("`" . static::$_idField . "` IN (" . implode(',', $idList) . ")"))
+          ->where(array("`".static::$_idField."` IN (".implode(',', $idList).")"))
       );
     } else {
       $query = new DbEmptyIterator();
@@ -125,7 +125,7 @@ 
 
     $result = array();
     if (!empty($idList)) {
-      foreach(static::queryExistsIdInList($idList) as $row) {
+      foreach (static::queryExistsIdInList($idList) as $row) {
         $result[] = $row[static::$_idField];
       }
     }
@@ -150,7 +150,7 @@ 
    */
   protected static function selectIterator($sql) {
     $result = static::$dbStatic->selectIterator($sql, false);
-    if(!($result instanceof DbResultIterator)) {
+    if (!($result instanceof DbResultIterator)) {
       $result = new DbEmptyIterator();
     }
     return $result;