Skip to content

Commit

Permalink
Indentation fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbogdani
jbogdani committed Sep 30, 2021
1 parent d702b27 commit 087c964
Showing 1 changed file with 40 additions and 32 deletions.
72 changes: 40 additions & 32 deletions lib/Article.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private static function parseArt($article, $lang = false, $return_bean = false)

// add FULL URL
$article->full_url = str_replace('/./', '/', utils::getBaseUrl() .
(is_array(self::$parts) ? implode('/', self::$parts) : $article->url));
(is_array(self::$parts) ? implode('/', self::$parts) : $article->url));

// add article image link
$image_steps = cfg::get('art_img');
Expand All @@ -126,7 +126,7 @@ private static function parseArt($article, $lang = false, $return_bean = false)

if (file_exists('./sites/default/images/articles/' . $step . '/' . $article->id . '.jpg')) {
$art_img[$step] = utils::getBaseUrl() . 'sites/default/images/articles/' . $step . '/' . $article->id . '.jpg';
$art_img[$x+1] = utils::getBaseUrl() . 'sites/default/images/articles/' . $step . '/' . $article->id . '.jpg';
$art_img[$x + 1] = utils::getBaseUrl() . 'sites/default/images/articles/' . $step . '/' . $article->id . '.jpg';
}
}
}
Expand Down Expand Up @@ -192,9 +192,9 @@ public static function getAll($sql = false, $lang = false)
public static function getAllValid($lang = false, $dontparse = false, $limit = false)
{
$articles = R::find(
self::art_tb(),
' ' . self::$valid_art . ' ORDER BY `sort` DESC ' . ($limit ? ' LIMIT ' . $limit : '')
);
self::art_tb(),
' ' . self::$valid_art . ' ORDER BY `sort` DESC ' . ($limit ? ' LIMIT ' . $limit : '')
);

if ($dontparse) {
return $articles;
Expand Down Expand Up @@ -239,10 +239,10 @@ public static function deleteTag($tag)
public static function deleteUnusedTags()
{
$one = R::exec('DELETE FROM `' . PREFIX . 'articles_tag` WHERE ' .
'`articles_id` NOT IN( SELECT `id` FROM `' . PREFIX . 'articles`)');
'`articles_id` NOT IN( SELECT `id` FROM `' . PREFIX . 'articles`)');

$two = R::exec('DELETE FROM `' . PREFIX . 'tag` WHERE ' .
'`id` NOT IN( SELECT `tag_id` FROM `' . PREFIX . 'articles_tag`)');
'`id` NOT IN( SELECT `tag_id` FROM `' . PREFIX . 'articles_tag`)');

return ($one || $two);
}
Expand Down Expand Up @@ -360,15 +360,15 @@ public static function getByFilter($filter, $lang, $connector = 'AND', $start =

if ($start !== false && $max) {
$sql .= " ORDER BY `articles`.publish DESC "
. " LIMIT " . (int)$start . ", " . (int)$max;
. " LIMIT " . (int)$start . ", " . (int)$max;
}


$articles = R::find(
self::art_tb(),
$sql,
$values
);
self::art_tb(),
$sql,
$values
);

if (!is_array($articles)) {
return false;
Expand All @@ -392,22 +392,22 @@ public static function getByFilter($filter, $lang, $connector = 'AND', $start =
public static function getByTag($tags, $lang = false, $lax = false, $admin = false, $start = false, $max = false, $returnCount = false)
{
$sql = "SELECT `articles`." . ($returnCount ? 'id' : '*') . " FROM `articles` "
. "INNER JOIN `articles_tag` ON `articles_id` = `articles`.`id` "
. "INNER JOIN `tag` ON `articles_tag`.`tag_id` = `tag`.`id` "
. "WHERE `tag`.`title` IN ('" . implode("', '", $tags). "') ";
. "INNER JOIN `articles_tag` ON `articles_id` = `articles`.`id` "
. "INNER JOIN `tag` ON `articles_tag`.`tag_id` = `tag`.`id` "
. "WHERE `tag`.`title` IN ('" . implode("', '", $tags) . "') ";
if (!$admin) {
$sql .= " AND `articles`.status = 1 AND "
. "`articles`.`publish` <= DATE('now') AND "
. "("
. "`articles`.`expires` = '0000-00-00 00:00:00' OR "
. "`articles`.`expires` = '0000-00-00' OR "
. "`articles`.`expires` = '0000-00-00' OR "
. "`articles`.`expires` = `articles`.`publish` OR "
. "`articles`.`expires` > '" . date("Y-m-d H:i:s") . "' "
. ") ";
. "`articles`.`publish` <= DATE('now') AND "
. "("
. "`articles`.`expires` = '0000-00-00 00:00:00' OR "
. "`articles`.`expires` = '0000-00-00' OR "
. "`articles`.`expires` = '0000-00-00' OR "
. "`articles`.`expires` = `articles`.`publish` OR "
. "`articles`.`expires` > '" . date("Y-m-d H:i:s") . "' "
. ") ";
}
$sql .= "GROUP BY `articles`.`id` "
. "HAVING count(`articles`.`id`) >= " . ($lax ? 1 : count($tags));
. "HAVING count(`articles`.`id`) >= " . ($lax ? 1 : count($tags));

if ($returnCount) {
return count(R::getAll($sql));
Expand Down Expand Up @@ -474,8 +474,14 @@ public static function getByTag($tags, $lang = false, $lax = false, $admin = fal
* @param boolean $returnCount If true te total records will be returned
* @return boolean
*/
public static function search($string, $lang = false, $dontseparate = false, $start = false, $max = false, $returnCount = false)
{
public static function search(
$string,
$lang = false,
$dontseparate = false,
$start = false,
$max = false,
$returnCount = false
) {
$searcheableFields = array('title', 'textid', 'author', 'summary', 'text', 'keywords');

if ($dontseparate) {
Expand All @@ -495,8 +501,10 @@ public static function search($string, $lang = false, $dontseparate = false, $st
$sql_micro_part = [];

foreach ($string_arr as $str) {
$sql_micro_part[] = "`" . $fld . "` LIKE ?";
array_push($values, "%" . $str . "%");
if ($str && $str !== '') {
$sql_micro_part[] = "`" . $fld . "` LIKE ?";
array_push($values, "%" . $str . "%");
}
}
$sql_part[] = ' (' . implode(' AND ', $sql_micro_part) . ') ';
}
Expand All @@ -513,10 +521,10 @@ public static function search($string, $lang = false, $dontseparate = false, $st
}

$articles = R::find(
self::art_tb(),
$sql,
$values
);
self::art_tb(),
$sql,
$values
);

if (!is_array($articles)) {
return false;
Expand Down

0 comments on commit 087c964

Please sign in to comment.