diff --git a/objects/EpgParser.php b/objects/EpgParser.php index 02953ec046..4c8bc06f49 100644 --- a/objects/EpgParser.php +++ b/objects/EpgParser.php @@ -42,14 +42,14 @@ class EpgParser { } /** - * @param mixed $url - url + * @param mixed $url - url */ public function setUrl($url): void { $this->url = $url; } /** - * @param mixed $content = xml parsed string. + * @param mixed $content = xml parsed string. */ public function setContent($content): void { $this->content = $content; @@ -78,7 +78,7 @@ class EpgParser { /** * Set group by for channels must be channels atribute. - * @param $group - channel will be grouped with. must be @id or pgram attribute. + * @param $group - channel will be grouped with. must be @id or pgram attribute. */ public function setChannelGroup($group) { $this->channels_groupby = $group; @@ -103,9 +103,9 @@ class EpgParser { $dt->setTimezone(new DateTimeZone($this->targetTimeZone)); return $dt->format('Y-m-d H:i:s'); } catch (\Exception $e) { - + } catch (\Error $e) { - + } try { @@ -113,9 +113,9 @@ class EpgParser { $dt->setTimezone(new DateTimeZone($this->targetTimeZone)); return $dt->format('Y-m-d H:i:s'); } catch (\Exception $e) { - + } catch (\Error $e) { - + } @@ -134,9 +134,9 @@ class EpgParser { $dt->setTimezone(new DateTimeZone($this->targetTimeZone)); return $dt->format('Y-m-d H:i:s'); } catch (\Exception $e) { - + } catch (\Error $e) { - + } @@ -170,14 +170,14 @@ class EpgParser { } /** - * + * */ public function resetChannelfilter(): void { $this->channelfilter = []; } /** - * + * */ private function channelMatchFilter(string $channel): bool { return array_key_exists($channel, $this->channelfilter); @@ -197,7 +197,7 @@ class EpgParser { throw new \RuntimeException('file does not exists: ' . $this->file); } - // + // $xml = new XMLReader(); // compress.zlib://' @@ -207,7 +207,7 @@ class EpgParser { /** @noinspection LoopWhichDoesNotLoopInspection */ /** @noinspection MissingOrEmptyGroupStatementInspection */ while ($xml->read() && $xml->name !== 'channel') { - + } $i = 0; @@ -261,7 +261,7 @@ class EpgParser { /** @noinspection LoopWhichDoesNotLoopInspection */ /** @noinspection MissingOrEmptyGroupStatementInspection */ while ($xml->read() && $xml->name !== 'programme') { - + } while ($xml->name === 'programme') { @@ -388,5 +388,4 @@ class EpgParser { throw new \RuntimeException("Content of this request its not XML: $errors"); } } - } diff --git a/objects/Object.php b/objects/Object.php index 4a97729f97..dfb72e58c0 100644 --- a/objects/Object.php +++ b/objects/Object.php @@ -372,9 +372,9 @@ abstract class ObjectYPT implements ObjectInterface $insert_row = sqlDAL::writeSql($sql, $formats, $values); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if ($insert_row) { if (empty($this->id)) { diff --git a/objects/aVideoEncoder.json.php b/objects/aVideoEncoder.json.php index 2c8a008d1e..6b9d8e290c 100644 --- a/objects/aVideoEncoder.json.php +++ b/objects/aVideoEncoder.json.php @@ -69,7 +69,7 @@ if (empty($title) && !empty($_POST['title'])) { $title = $video->setTitle($_POST['title']); } elseif (empty($title)) { $video->setTitle("Automatic Title"); -}else{ +}else{ _error_log("aVideoEncoder.json: Title not updated {$_POST['title']} "); } diff --git a/objects/categories.json.php b/objects/categories.json.php index e9c1609cec..a9d7dad9bb 100644 --- a/objects/categories.json.php +++ b/objects/categories.json.php @@ -27,7 +27,7 @@ $total = Category::getTotalCategories(true, $onlyWithVideos); foreach ($categories as $key => $value) { $categories[$key]['iconHtml'] = ""; $categories[$key]['users_groups_ids_array'] = Categories_has_users_groups::getUserGroupsIdsFromCategory($value['id']); - + if(empty($categories[$key]['users_groups_ids_array'])){ $categories[$key]['total_users_groups'] = 0; }else{ diff --git a/objects/category.php b/objects/category.php index 0c4dfaecb0..57bd1f1086 100644 --- a/objects/category.php +++ b/objects/category.php @@ -182,7 +182,7 @@ class Category { } } /** - * + * * @param string $clean_title * @param int $count * @param int $id @@ -440,11 +440,11 @@ class Category { //_error_log("getAllCategories id={$row['id']} line=".__LINE__); $totals = self::getTotalFromCategory($row['id']); - + if($onlyWithVideos && empty($totals['total'])){ continue; } - + //_error_log("getAllCategories id={$row['id']} line=".__LINE__); $fullTotals = self::getTotalFromCategory($row['id'], false, true, true); @@ -988,5 +988,4 @@ class Category { } return $return; } - } diff --git a/objects/categoryAddNew.json.php b/objects/categoryAddNew.json.php index 6e42708823..d703cf9ba2 100644 --- a/objects/categoryAddNew.json.php +++ b/objects/categoryAddNew.json.php @@ -48,7 +48,7 @@ if (!empty($obj->categories_id)) { $obj->image2 = saveCroppieImage($path['path'], "image2"); $obj->image2P = $path['path']; _error_log('CategoryAddnew: save image 2 '.$path['path']); - + // save usergroups _error_log('CategoryAddnew: save usergroups '. json_encode($obj->usergroups_ids_array)); Category::setUsergroups($obj->categories_id, $obj->usergroups_ids_array); diff --git a/objects/comment.php b/objects/comment.php index 30535a3633..cf7f78cc67 100644 --- a/objects/comment.php +++ b/objects/comment.php @@ -29,7 +29,7 @@ class Comment { $this->load($id); } } - + public function getPin() { return $this->pin; } @@ -37,7 +37,7 @@ class Comment { public function setPin($pin): void { $this->pin = intval($pin); } - + public function getId() { return $this->id; } @@ -87,7 +87,7 @@ class Comment { if (empty($this->comments_id_pai)) { $this->comments_id_pai = 'NULL'; } - + $this->pin = intval($this->pin); if (empty($this->videos_id) && !empty($this->comments_id_pai)) { @@ -375,13 +375,13 @@ class Comment { return $commentsArray; } - static function addExtraInfo2($row) { + static function addExtraInfo2($row) { if(empty($row['commentHTML'])){ $row['comment'] = str_replace('\n', "\n", $row['comment']); $row['commentPlain'] = xss_esc_back($row['comment']); $row['commentHTML'] = nl2br($row['commentPlain']); } - + $row['identification'] = User::getNameIdentificationById($row['users_id']); $row['commentWithLinks'] = self::fixCommentText(textToLink($row['commentHTML'])); $row['humanTiming'] = humanTiming(strtotime($row['created'])); @@ -408,5 +408,4 @@ class Comment { $replace = ["
"]; return stripslashes(str_replace($search, $replace, $subject)); } - } diff --git a/objects/commentAddNew.json.php b/objects/commentAddNew.json.php index 6bc886eea6..7c92cb5313 100644 --- a/objects/commentAddNew.json.php +++ b/objects/commentAddNew.json.php @@ -126,7 +126,7 @@ if (!empty($obj->comments_id)) { $obj->error = false; $obj->comment = Comment::getComment($obj->comments_id); $obj->comment = Comment::addExtraInfo2($obj->comment); - + $obj->msg = __("Your comment has been saved!"); } else { $obj->msg = __("Your comment has NOT been saved!"); diff --git a/objects/commentDelete.json.php b/objects/commentDelete.json.php index 6ab8494674..0ab7a1f50b 100644 --- a/objects/commentDelete.json.php +++ b/objects/commentDelete.json.php @@ -29,7 +29,7 @@ if(!empty($obj->status)){ $obj->error = false; //$obj->comments = Comment::getAllComments($obj->videos_id); //$obj->comments = Comment::addExtraInfo($obj->comments); - + } die(_json_encode($obj)); diff --git a/objects/commentPinToogle.json.php b/objects/commentPinToogle.json.php index 1488f77393..eeed62b0c5 100644 --- a/objects/commentPinToogle.json.php +++ b/objects/commentPinToogle.json.php @@ -31,7 +31,7 @@ $obj->save = $objC->save(); if (!empty($obj->save)) { $obj->error = false; $obj->comment = Comment::getComment($obj->comments_id); - $obj->comment = Comment::addExtraInfo2($obj->comment); + $obj->comment = Comment::addExtraInfo2($obj->comment); if($obj->new_pin_value){ $obj->msg = __("Your comment is pinned"); }else{ diff --git a/objects/functionCroppie.php b/objects/functionCroppie.php index c5a8bcb09a..23a8e04a55 100644 --- a/objects/functionCroppie.php +++ b/objects/functionCroppie.php @@ -36,14 +36,14 @@ $croppieFilesAdded = 1; var viewportHeight = ; var boundaryWidth = ; var boundaryHeight = ; - + var parentWidth = $('#croppie').parent().width(); var totalWidth = viewportWidth+(boundaryWidth-viewportWidth); - + if(parentWidth <= totalWidth){ var factor = (parentWidth/(totalWidth)); console.log('createCroppie parent and factor ', parentWidth, totalWidth, factor, viewportWidth, viewportHeight, boundaryWidth, boundaryHeight); - + viewportWidth = parseInt(viewportWidth * factor); viewportHeight = parseInt(viewportHeight * factor); boundaryWidth = viewportWidth; @@ -53,20 +53,20 @@ $croppieFilesAdded = 1; }else{ console.log('createCroppie ', viewportWidth, viewportHeight, boundaryWidth, boundaryHeight); } - + var paddingTop = 25; var saveButton = 55; var slider = 25; var uploadDeleteButtons = 40; var parentHeight = $('body').height(); - + var totalHeight = viewportHeight+(boundaryHeight-viewportHeight)+paddingTop+saveButton+slider+uploadDeleteButtons; - + if(parentHeight <= totalHeight){ var factor = (parentHeight/(totalHeight)); console.log('createCroppie height parent and factor parentHeight, totalHeight', parentHeight, totalHeight); console.log('createCroppie height parent and factor factor, viewportWidth, viewportHeight', factor, viewportWidth, viewportHeight); - + viewportWidth = parseInt(viewportWidth * factor); viewportHeight = parseInt(viewportHeight * factor); boundaryWidth = viewportWidth; @@ -77,7 +77,7 @@ $croppieFilesAdded = 1; console.log('createCroppie height', parentHeight, totalHeight, viewportHeight, boundaryWidth, boundaryHeight); } - + uploadCrop = $('#croppie').croppie({ //url: imageURL, //enableExif: true, @@ -112,7 +112,7 @@ $croppieFilesAdded = 1; - $('#croppie').croppie('setZoom', ); + $('#croppie').croppie('setZoom', ); diff --git a/objects/functionGetHamburgerButton.php b/objects/functionGetHamburgerButton.php index e3672fdeb3..162035e53f 100644 --- a/objects/functionGetHamburgerButton.php +++ b/objects/functionGetHamburgerButton.php @@ -5,7 +5,7 @@ if ($startActive) { $svgClass .= ' active'; } if ($invert) { - + if(preg_match('/style=["\']/', $parameters)){ $parameters = str_replace(array('style="','style=\''), array('style="transform: scale(-1,1);', 'style=\'transform: scale(-1,1);'), $parameters ); }else{ @@ -28,7 +28,7 @@ if ($invert) { - + - + - + - - - - diff --git a/objects/functionogSite.php b/objects/functionogSite.php index 0252a75a1d..0650bc9d52 100644 --- a/objects/functionogSite.php +++ b/objects/functionogSite.php @@ -18,7 +18,7 @@ if ($users_id = isChannel()) { $img = Category::getOGImage($category['id']); $title = html2plainText($category['name']); $url = Category::getCategoryLinkFromName($_GET['catName']); - $description = html2plainText($category['description']); + $description = html2plainText($category['description']); echo PHP_EOL."".PHP_EOL; ?> @@ -85,4 +85,4 @@ if (!empty($advancedCustom->twitter_summary_large_image)) { - \ No newline at end of file + diff --git a/objects/functions.php b/objects/functions.php index c5e1f3f08b..d714086160 100644 --- a/objects/functions.php +++ b/objects/functions.php @@ -436,7 +436,7 @@ function safeString($text, $strict = false, $try=0){ //$text = cleanURLName($text); } $text = trim($text); - + if(empty($try) && empty($text)){ return safeString(utf8_encode($originalText), $strict, 1); } @@ -1433,7 +1433,7 @@ function getVideosURL_V2($fileName, $recreateCache = false) $cacheName = "getVideosURL_V2$fileName"; if (empty($recreateCache)) { - + $lifetime = maxLifetime(); $TimeLog1 = "getVideosURL_V2($fileName) empty recreateCache"; @@ -1496,7 +1496,7 @@ function getVideosURL_V2($fileName, $recreateCache = false) $isAVideo = false; foreach ($filesInDir as $file) { $parts = pathinfo($file); - + if($parts['extension'] == 'log'){ continue; } @@ -1555,7 +1555,7 @@ function getVideosURL_V2($fileName, $recreateCache = false) $files[$key] = AVideoPlugin::modifyURL($_file); } TimeLogEnd($timeName, __LINE__); - + $pdf = $paths['path'] . "{$cleanfilename}.pdf"; $mp3 = $paths['path'] . "{$cleanfilename}.mp3"; @@ -1577,7 +1577,7 @@ function getVideosURL_V2($fileName, $recreateCache = false) $extraFiles = array_merge($extraFiles, $extraFilesMP3); } $files = array_merge($extraFiles, $files); - + ObjectYPT::setCache($cacheName, $files); } if (is_array($files)) { @@ -2004,7 +2004,7 @@ function scaleUpImage($file_src, $file_dest, $wd, $hd) echo '

Results

'; var_dump($sizes);exit; } - * + * */ $thumb_w = $sizes['w']; $thumb_h = $sizes['h']; @@ -4704,9 +4704,9 @@ function _mysql_commit(){ if (_mysql_is_open()) { try { /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ @$global['mysqli']->commit(); } catch (Exception $exc) { @@ -4723,9 +4723,9 @@ function _mysql_close() $mysql_connect_was_closed = 1; try { /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ @$global['mysqli']->close(); } catch (Exception $exc) { @@ -4968,7 +4968,7 @@ function getUsageFromFilename($filename, $dir = "") * @param $url - The location of the remote file to download. Cannot * be null or empty. * - * @return int + * @return int * return The size of the file referenced by $url, or false if the size * could not be determined. */ @@ -5796,14 +5796,14 @@ function isValidEmail($email) { if(!isset($_email_hosts_checked)){ $_email_hosts_checked = array(); } - + //Get host name from email and check if it is valid $email_host = array_slice(explode("@", $email), -1)[0]; if(isset($_email_hosts_checked[$email_host])){ return $_email_hosts_checked[$email_host]; } - + $_email_hosts_checked[$email_host] = true; // Check if valid IP (v4 or v6). If it is we can't do a DNS lookup if (!filter_var($email_host, FILTER_VALIDATE_IP, [ @@ -9408,9 +9408,9 @@ function mysqlBeginTransaction() global $global; _error_log('Begin transaction ' . getSelfURI()); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ $global['mysqli']->autocommit(false); } @@ -9420,9 +9420,9 @@ function mysqlRollback() global $global; _error_log('Rollback transaction ' . getSelfURI(), AVideoLog::$ERROR); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ $global['mysqli']->rollback(); $global['mysqli']->autocommit(true); @@ -9433,9 +9433,9 @@ function mysqlCommit() global $global; _error_log('Commit transaction ' . getSelfURI()); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ $global['mysqli']->commit(); $global['mysqli']->autocommit(true); @@ -10087,9 +10087,9 @@ function getValidCrontabLines() } /** - * - * @param string $strOrArray - * @return string return an array with the valid emails. + * + * @param string $strOrArray + * @return string return an array with the valid emails. */ function is_email($strOrArray) { @@ -10510,7 +10510,7 @@ function getFeedButton($rss, $mrss, $roku) { $buttons = '
@@ -10598,4 +10598,4 @@ function setIsConfirmationPage(){ function isConfirmationPage(){ global $_isConfirmationPage; return !empty($_isConfirmationPage); -} \ No newline at end of file +} diff --git a/objects/include_config.php b/objects/include_config.php index b4ddee0a61..e04f8573b8 100644 --- a/objects/include_config.php +++ b/objects/include_config.php @@ -7,7 +7,7 @@ if (!empty($doNotIncludeConfig)) { if($_SERVER["HTTP_HOST"] === 'localhost' || $_SERVER["HTTP_HOST"] === '127.0.0.1'){ $global["webSiteRootURL"] = $_SERVER["REQUEST_SCHEME"].'://'.$_SERVER["HTTP_HOST"].$global["webSiteRootPath"]; } - * + * */ //if(!empty($global['debugMemmory'])){return false;} //if(!empty($global['debugMemmory'])){var_dump(__LINE__);exit;} diff --git a/objects/mention.json.php b/objects/mention.json.php index c4ad0e6167..6b320e48f6 100644 --- a/objects/mention.json.php +++ b/objects/mention.json.php @@ -19,11 +19,10 @@ if(preg_match('/^@/', $_REQUEST['term'])){ foreach ($users as $key => $value) { $response[] = array( 'id'=>$value['id'], - 'value'=>$value['identification'], + 'value'=>$value['identification'], 'label'=>Video::getCreatorHTML($value['id'], '', true, true) ); } } - echo json_encode($response); diff --git a/objects/mysql_dal.php b/objects/mysql_dal.php index b091e406fc..5c2f44e32e 100644 --- a/objects/mysql_dal.php +++ b/objects/mysql_dal.php @@ -1,5 +1,4 @@ query($templine)) { _error_log('sqlDAL::executeFile ' . $filename . ' Error performing query \'' . $templine . '\': ' . $global['mysqli']->error . '

', AVideoLog::$ERROR); @@ -117,9 +116,9 @@ class sqlDAL } /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if (!($stmt = $global['mysqli']->prepare($preparedStatement))) { log_error("[sqlDAL::writeSql] Prepare failed: (" . $global['mysqli']->errno . ") " . $global['mysqli']->error . @@ -151,7 +150,7 @@ class sqlDAL _mysql_connect(); return self::writeSql($preparedStatement, $formats, $values); } - * + * */ $stmt->close(); @@ -203,9 +202,9 @@ class sqlDAL // When not cached /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ $readSqlCached[$crc] = "false"; _mysql_connect(); @@ -290,9 +289,9 @@ class sqlDAL // Mysqlnd-fallback /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if (!($stmt = $global['mysqli']->prepare($preparedStatement))) { log_error("[sqlDAL::readSql] (no mysqlnd) Prepare failed: (" . $global['mysqli']->errno . ") " . $global['mysqli']->error . " ({$preparedStatement})"); diff --git a/objects/playlist.php b/objects/playlist.php index ee9b245ba8..669d7987f5 100644 --- a/objects/playlist.php +++ b/objects/playlist.php @@ -350,12 +350,12 @@ class PlayList extends ObjectYPT { _session_start(); unset($_SESSION['user']['sessionCache']['getAllFromUserVideo'][$videos_id]); } - + public static function getSuggested() { global $global; - + return Video::getAllVideosLight("viewableNotUnlisted", false, false, true, 'serie'); - + } public static function getVideosIDFromPlaylistLight($playlists_id) { @@ -384,7 +384,7 @@ class PlayList extends ObjectYPT { foreach ($fullData as $key => $row) { if (empty($playlists_id)) { $row['order'] = $key; - } + } $rows[] = $row; } } else { @@ -744,7 +744,7 @@ class PlayList extends ObjectYPT { public function getName() { return $this->name; } - + public function getNameOrSerieTitle() { return PlayLists::getNameOrSerieTitle($this->id); } @@ -865,5 +865,4 @@ class PlayList extends ObjectYPT { } return false; } - } diff --git a/objects/security.php b/objects/security.php index e96322a920..a951790969 100644 --- a/objects/security.php +++ b/objects/security.php @@ -61,7 +61,7 @@ foreach ($scanVars as $value) { } } } - + foreach ($securityRemoveNonCharsStrict as $value) { if (!empty($scanThis[$value])) { if (is_string($scanThis[$value])) { diff --git a/objects/sendEmail.json.php b/objects/sendEmail.json.php index 7c33abd063..941f0c4bc1 100644 --- a/objects/sendEmail.json.php +++ b/objects/sendEmail.json.php @@ -43,7 +43,7 @@ if ($valid) { //Set the subject line $mail->Subject = 'Message From Site ' . $config->getWebSiteTitle() . " ({$_POST['first_name']})"; $mail->msgHTML($msg); - + _error_log("Send email now"); //send the message, check for errors if (!$mail->send()) { diff --git a/objects/sites.php b/objects/sites.php index 2dd0ee5bef..4bc98c87a9 100644 --- a/objects/sites.php +++ b/objects/sites.php @@ -106,7 +106,7 @@ class Sites extends ObjectYPT foreach ($fullData as $row) { $rows[] = $row; } - } + } return $rows; } } diff --git a/objects/subscribe.php b/objects/subscribe.php index 1c6175046f..6ea9553f0f 100644 --- a/objects/subscribe.php +++ b/objects/subscribe.php @@ -82,7 +82,7 @@ class Subscribe extends ObjectYPT{ AVideoPlugin::onNewSubscription($this->users_id, $this->subscriber_users_id); } } - + return $saved; } @@ -205,7 +205,7 @@ class Subscribe extends ObjectYPT{ if (in_array($row['email'], $emails)) { //continue; } - //$value['notify'] = + //$value['notify'] = $emails[] = $row['email']; $row['identification'] = User::getNameIdentificationById($row['subscriber_id']); if ($row['identification'] === __("Unknown User")) { @@ -289,7 +289,7 @@ class Subscribe extends ObjectYPT{ $subscribe[] = $row; } //$subscribe = $res->fetch_all(MYSQLI_ASSOC); - } + } return $subscribe; } diff --git a/objects/user.php b/objects/user.php index f281005ff6..113143279e 100644 --- a/objects/user.php +++ b/objects/user.php @@ -12,9 +12,9 @@ require_once $global['systemRootPath'] . 'plugin/AVideoPlugin.php'; /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ class User { @@ -747,9 +747,9 @@ if (typeof gtag !== \"function\") { $insert_row = sqlDAL::writeSql($sql, $formats, $values); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if ($insert_row) { if (empty($this->id)) { @@ -953,7 +953,7 @@ if (typeof gtag !== \"function\") { try { sqlDAL::writeSql($sql, "i", [$this->id]); } catch (Exception $exc) { - + } } @@ -1293,10 +1293,10 @@ if (typeof gtag !== \"function\") { } return $can; } - + static public function getLastUserCanStreamReason() { global $_thisUserCanStreamReasonMessage; - + return $_thisUserCanStreamReasonMessage; } @@ -2398,7 +2398,7 @@ if (typeof gtag !== \"function\") { $contactEmail = $config->getContactEmail(); $webSiteTitle = $config->getWebSiteTitle(); /** - * @var string $email + * @var string $email */ $email = ''; $email = $user->getEmail(); @@ -2577,9 +2577,9 @@ if (typeof gtag !== \"function\") { $row = self::getBlob($users_id, $type); $null = null; /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if (!empty($row['id'])) { $sql = "UPDATE users_blob SET `blob` = ? , modified = now() WHERE id = ?"; @@ -3065,5 +3065,4 @@ if (typeof gtag !== \"function\") { } return $_SESSION['swapUser']['id']; } - } diff --git a/objects/userAddNew.json.php b/objects/userAddNew.json.php index 6b25e9495e..ee83679cf6 100644 --- a/objects/userAddNew.json.php +++ b/objects/userAddNew.json.php @@ -86,7 +86,7 @@ _error_log("userAddNew.json.php: saving"); $obj->users_id = $user->save(true); if (!empty($obj->users_id) && !empty($_POST['usersExtraInfo'])) { - + $obj->status = $obj->users_id; if (!empty($_POST['usersExtraInfo'])) { User::saveExtraInfo(json_encode($_POST['usersExtraInfo']), $obj->users_id); diff --git a/objects/userGroupSave.json.php b/objects/userGroupSave.json.php index 0b919923a8..9d638a4e34 100644 --- a/objects/userGroupSave.json.php +++ b/objects/userGroupSave.json.php @@ -29,6 +29,6 @@ foreach ($obj->videos_ids as $videos_id) { $obj->delResponse = UserGroups::deleteVideoGroups($videos_id, $obj->users_groups_id); $obj->error = empty($obj->delResponse); } - + } die(json_encode($obj)); diff --git a/objects/userGroups.php b/objects/userGroups.php index 5c146191ba..8d779d6691 100644 --- a/objects/userGroups.php +++ b/objects/userGroups.php @@ -69,9 +69,9 @@ class UserGroups{ } if (sqlDAL::writeSql($sql, $formats, $values)) { /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if (empty($this->id)) { $id = $global['mysqli']->insert_id; @@ -279,7 +279,7 @@ class UserGroups{ if(!isset($__getUserGroups)){ $__getUserGroups = array(); - } + } if(isset($__getUserGroups[$users_id])){ return $__getUserGroups[$users_id]; @@ -451,15 +451,15 @@ class UserGroups{ } return $arr; } - + public static function getCategoriesGroups($videos_id){ if (empty($videos_id)) { return []; } global $global; - + $v = Video::getVideoLight($videos_id); - + $sql = "SELECT chug.*, ug.* FROM categories_has_users_groups as chug " . " LEFT JOIN users_groups as ug ON users_groups_id = ug.id WHERE categories_id = ? "; $res = sqlDAL::readSql($sql, "i", [$v['categories_id']]); @@ -477,10 +477,10 @@ class UserGroups{ } return $arr; } - + public static function getVideosAndCategoriesUserGroups($videos_id, $force = false){ global $_getVideosAndCategoriesUserGroups; - + if(!isset($_getVideosAndCategoriesUserGroups)){ $_getVideosAndCategoriesUserGroups = array(); } @@ -518,7 +518,7 @@ class UserGroups{ } else { return false; } - + unset($_getVideosAndCategoriesUserGroups[$videos_id]); return sqlDAL::writeSql($sql, "i", [$videos_id]); } diff --git a/objects/users.json.php b/objects/users.json.php index 3c632cd9b8..117cadacb2 100644 --- a/objects/users.json.php +++ b/objects/users.json.php @@ -71,11 +71,11 @@ if (empty($users)) { } if(empty($u['creator'])){ $u['creator'] = Video::getCreatorHTML($u['id'], '', true, true); - } + } if(empty($u['photo'])){ $u['photo'] = User::getPhoto($u['id']); - } - $users[$key] = $u; + } + $users[$key] = $u; } $json = _json_encode($users); diff --git a/objects/video.php b/objects/video.php index 011bbf384d..ceaf51b49f 100644 --- a/objects/video.php +++ b/objects/video.php @@ -367,7 +367,7 @@ if (!class_exists('Video')) { if (empty($this->type) || !in_array($this->type, self::$typeOptions)) { $this->type = 'video'; } else if (!empty($this->id) && $this->type == 'linkVideo') { - // chek if it has no media + // chek if it has no media $types = Video::getVideoTypeFromId($this->id); if (!empty($types)) { if ($types->mp4 || $types->webm || $types->m3u8) { @@ -497,9 +497,9 @@ if (!class_exists('Video')) { } } /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ //var_dump($this->title, $insert_row);exit; if ($insert_row) { @@ -547,9 +547,9 @@ if (!class_exists('Video')) { return $id; } /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ _error_log('Video::save Error : (' . $global['mysqli']->errno . ') ' . $global['mysqli']->error); return false; @@ -671,9 +671,9 @@ if (!class_exists('Video')) { return false; } /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ _error_log("Video::setStatus " . json_encode($_REQUEST)); _error_log("Video::setStatus({$status}) " . json_encode(debug_backtrace())); @@ -746,9 +746,9 @@ if (!class_exists('Video')) { $res = sqlDAL::writeSql($sql, $formats, $values); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if ($global['mysqli']->errno !== 0) { die('Error on update Rotation: (' . $global['mysqli']->errno . ') ' . $global['mysqli']->error); @@ -762,7 +762,7 @@ if (!class_exists('Video')) { } /** - * + * * @return int */ public function getUsers_id() { @@ -783,9 +783,9 @@ if (!class_exists('Video')) { $values = [$saneZoom, $this->id]; $res = sqlDAL::writeSql($sql, $formats, $values); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if ($global['mysqli']->errno !== 0) { die('Error on update Zoom: (' . $global['mysqli']->errno . ') ' . $global['mysqli']->error); @@ -1172,9 +1172,9 @@ if (!class_exists('Video')) { return false; } /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ $sql = "SELECT * FROM videos v WHERE v.id != {$videos_id} AND v.status='a' AND (categories_id = {$video['categories_id']} "; if (AVideoPlugin::isEnabledByName("VideoTags")) { @@ -1246,9 +1246,9 @@ if (!class_exists('Video')) { } $tolerance = 0.5; /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if (!empty($_POST['sort']['suggested'])) { $suggestedOnly = true; @@ -1485,9 +1485,9 @@ if (!class_exists('Video')) { $allowedDurationTypes = array('video', 'audio'); /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ self::startTransaction(); foreach ($fullData as $index => $row) { @@ -1885,7 +1885,7 @@ if (!class_exists('Video')) { if (!empty($_GET['catName'])) { $cn .= ", c.clean_name as cn"; } - * + * */ if (AVideoPlugin::isEnabledByName("VideoTags")) { if (!empty($_GET['tags_id']) && empty($videosArrayId)) { @@ -2013,7 +2013,7 @@ if (!class_exists('Video')) { $res = sqlDAL::readSql($sql); $numRows = sqlDal::num_rows($res); sqlDAL::close($res); - * + * */ global $lastGetTotalVideos; $lastGetTotalVideos = $sql; @@ -2145,7 +2145,7 @@ if (!class_exists('Video')) { if (!empty($content)) { $object->$value = self::parseProgress($content); } else { - + } if (!empty($object->$value->progress) && !is_numeric($object->$value->progress)) { @@ -3742,9 +3742,9 @@ if (!class_exists('Video')) { } /** - * + * * @var array $global - * @var array $global['avideo_resolutions'] + * @var array $global['avideo_resolutions'] */ foreach ($global['avideo_resolutions'] as $value) { $search[] = "_{$value}"; @@ -3851,7 +3851,7 @@ if (!class_exists('Video')) { } $HigestResolution = $video->getVideoHigestResolution(); if (!empty($HigestResolution)) { - //_error_log("getHigestResolution($filename) 1 {$HigestResolution} ".$video->getType()); + //_error_log("getHigestResolution($filename) 1 {$HigestResolution} ".$video->getType()); $resolution = $HigestResolution; $return['resolution'] = $resolution; $return['resolution_text'] = getResolutionText($return['resolution']); @@ -3954,9 +3954,9 @@ if (!class_exists('Video')) { global $global; $types = ['', '_HD', '_SD', '_Low']; /** - * + * * @var array $global - * @var array $global['avideo_resolutions'] + * @var array $global['avideo_resolutions'] */ $resolutions = $global['avideo_resolutions']; rsort($resolutions); @@ -4058,9 +4058,9 @@ if (!class_exists('Video')) { $types = ['', '_Low', '_SD', '_HD']; /** - * + * * @var array $global - * @var array $global['avideo_resolutions'] + * @var array $global['avideo_resolutions'] */ foreach ($global['avideo_resolutions'] as $value) { $types[] = "_{$value}"; @@ -5167,7 +5167,7 @@ if (!class_exists('Video')) { $video = new Video('', '', $videos_id); /** - * + * * @var string $status */ $status = $video->getStatus(); @@ -5475,16 +5475,16 @@ if (!class_exists('Video')) { $galleryVideoButtons = ''; $galleryVideoButtons .= '
- +
- - + +
'; if (Video::canEdit($videos_id)) { $galleryVideoButtons .= ' - +
'; } @@ -5493,9 +5493,9 @@ if (!class_exists('Video')) { $href = Video::getLink($video['id'], $video['clean_title']); $embed = Video::getLink($video['id'], $video['clean_title'], true); $title = safeString($video['title']); - $a = ''; if ($addLink) { $img = $a . $img . ''; diff --git a/objects/video_statistic.php b/objects/video_statistic.php index 0668c3639a..6c488b6abb 100644 --- a/objects/video_statistic.php +++ b/objects/video_statistic.php @@ -65,9 +65,9 @@ class VideoStatistic extends ObjectYPT { $insert_row = sqlDAL::writeSql($sql, "si", [getRealIpAddr(), $videos_id]); //if($videos_id==4){_error_log($sql);} /** - * + * * @var array $global - * @var object $global['mysqli'] + * @var object $global['mysqli'] */ if (!empty($global['mysqli']->insert_id)) { return $global['mysqli']->insert_id; @@ -129,14 +129,14 @@ class VideoStatistic extends ObjectYPT { $this->seconds_watching_video = intval($this->seconds_watching_video); $this->json = ($this->json); - + if(empty($this->id)){ $row = self::getLastStatistics($this->videos_id, $this->users_id); if(!empty($row)){ $this->id = $row['id']; } } - + return parent::save(); } @@ -321,13 +321,13 @@ class VideoStatistic extends ObjectYPT { public static function getChannelsWithMoreViews($daysLimit = 0) { global $global, $advancedCustom; - + if(empty($daysLimit)){ $daysLimit = getTrendingLimit(); } - + //$dateDaysLimit = getTrendingLimitDate(); - + $cacheName3 = "getChannelsWithMoreViews{$daysLimit}" . DIRECTORY_SEPARATOR . md5(json_encode([$_GET, $_POST])); $cache = ObjectYPT::getCache($cacheName3, 3600); // 1 hour cache if (!empty($cache)) { @@ -392,13 +392,13 @@ class VideoStatistic extends ObjectYPT { public static function getVideosWithMoreViews($status, $showOnlyLoggedUserVideos, $showUnlisted, $suggestedOnly, $daysLimit = 0) { global $global, $advancedCustom; - + if(empty($daysLimit)){ $daysLimit = getTrendingLimit(); } - + $dateDaysLimit = getTrendingLimitDate(); - + // get unique videos ids from the requested timeframe $sql = "SELECT distinct(videos_id) as videos_id FROM videos_statistics s " . " LEFT JOIN videos v ON v.id = videos_id " @@ -479,13 +479,13 @@ class VideoStatistic extends ObjectYPT { public static function getChannelsTotalViews($users_id, $daysLimit = 0) { global $global, $advancedCustom; - + if(empty($daysLimit)){ $daysLimit = getTrendingLimit(); } - + $dateDaysLimit = getTrendingLimitDate(); - + $cacheName = "getChannelsTotalViews($users_id, $daysLimit)"; $cache = ObjectYPT::getCache($cacheName, 3600); // 1 hour cache if (!empty($cache)) {