ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 03:30:48 +03:00
Code Issues Releases Wiki Activity

Удаление лишних файлов и данных

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-02-11 15:55:49 +07:00
parent c3f11f1ce7
commit d629a16cb2
6 changed files with 2 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
application/classes/modules/topic/entity/Topic.entity.class.php
View file

@ -517,70 +517,6 @@ class ModuleTopic_EntityTopic extends Entity {
return null;
}
/**
* Возвращает URL для топика-ссылки
*
* @param bool $bShort Укарачивать урл или нет
* @return null|string
*/
public function getLinkUrl($bShort=false) {
if ($this->getType()!='link') {
return null;
}
if ($this->getExtraValue('url')) {
if ($bShort) {
$sUrl=htmlspecialchars($this->getExtraValue('url'));
if (preg_match("/^https?:\/\/(.*)$/i",$sUrl,$aMatch)) {
$sUrl=$aMatch[1];
}
$sUrlShort=substr($sUrl,0,30);
if (strlen($sUrlShort)!=strlen($sUrl)) {
return $sUrlShort.'...';
}
return $sUrl;
}
$sUrl=$this->getExtraValue('url');
if (!preg_match("/^https?:\/\/(.*)$/i",$sUrl,$aMatch)) {
$sUrl='http://'.$sUrl;
}
return $sUrl;
}
return null;
}
/**
* Устанавливает URL для топика-ссылки
*
* @param string $data
*/
public function setLinkUrl($data) {
if ($this->getType()!='link') {
return;
}
$this->setExtraValue('url',$data);
}
/**
* Возвращает количество переходов по ссылке в топике-ссылке
*
* @return int|null
*/
public function getLinkCountJump() {
if ($this->getType()!='link') {
return null;
}
return (int)$this->getExtraValue('count_jump');
}
/**
* Устанавливает количество переходов по ссылке в топике-ссылке
*
* @param string $data
*/
public function setLinkCountJump($data) {
if ($this->getType()!='link') {
return;
}
$this->setExtraValue('count_jump',$data);
}
//*************************************************************************************************************************************************
@ -849,5 +785,4 @@ class ModuleTopic_EntityTopic extends Entity {
public function setCountFavourite($data) {
$this->_aData['topic_count_favourite']=$data;
}
}
?>
}

75
application/classes/modules/topic/entity/TopicQuestionVote.entity.class.php
View file

@ -1,75 +0,0 @@
<?php
/*-------------------------------------------------------
*
* LiveStreet Engine Social Networking
* Copyright © 2008 Mzhelskiy Maxim
*
*--------------------------------------------------------
*
* Official site: www.livestreet.ru
* Contact e-mail: rus.engine@gmail.com
*
* GNU General Public License, version 2:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*
---------------------------------------------------------
*/
/**
* Объект сущности голосования в топике-опросе
*
* @package modules.topic
* @since 1.0
*/
class ModuleTopic_EntityTopicQuestionVote extends Entity {
/**
* Возвращает ID топика
*
* @return int|null
*/
public function getTopicId() {
return $this->_getDataOne('topic_id');
}
/**
* Возвращает ID проголосовавшего пользователя
*
* @return int|null
*/
public function getVoterId() {
return $this->_getDataOne('user_voter_id');
}
/**
* Возвращает номер варианта
*
* @return int|null
*/
public function getAnswer() {
return $this->_getDataOne('answer');
}
/**
* Устанавливает ID топика
*
* @param int $data
*/
public function setTopicId($data) {
$this->_aData['topic_id']=$data;
}
/**
* Устанавливает ID проголосовавшего пользователя
*
* @param int $data
*/
public function setVoterId($data) {
$this->_aData['user_voter_id']=$data;
}
/**
* Устанавливает номер варианта
*
* @param int $data
*/
public function setAnswer($data) {
$this->_aData['answer']=$data;
}
}
?>

1
application/config/config.php
View file

@ -468,7 +468,6 @@ $config['head']['default']['js'] = array(
"___path.framework.frontend.web___/js/vendor/jquery.fileupload.js",
"___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.js",
"___path.framework.frontend.web___/js/vendor/prettify/prettify.js",
"___path.framework.frontend.web___/js/vendor/prettyphoto/js/jquery.prettyphoto.js",
"___path.framework.frontend.web___/js/vendor/parsley/parsley.js",
"___path.framework.frontend.web___/js/vendor/parsley/i18n/messages.ru.js",
"___path.framework.frontend.web___/js/vendor/jquery.livequery.js",

11
application/frontend/skin/developer/assets/js/init.js
View file

@ -213,17 +213,6 @@ jQuery(document).ready(function($){
ls.tags.init();
/**
* Photoset
*/
$('.js-photoset-type-default-image').prettyPhoto({
social_tools: '',
show_title: false,
slideshow: false,
deeplinking: false
});
/**
* Form validate
*/

1
application/frontend/skin/developer/settings/config/config.php
View file

@ -31,7 +31,6 @@ $aCss=array(
"___path.framework.frontend.web___/js/vendor/markitup/sets/synio/style.css",
"___path.framework.frontend.web___/js/vendor/jcrop/jquery.Jcrop.css",
"___path.framework.frontend.web___/js/vendor/prettify/prettify.css",
"___path.framework.frontend.web___/js/vendor/prettyphoto/css/prettyphoto.css",
"___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.css",
"___path.framework.frontend.web___/js/vendor/fotorama/fotorama.css",
"___path.framework.frontend.web___/js/vendor/nprogress/nprogress.css",

2
framework

@ -1 +1 @@
Subproject commit 6e59102a4d7c7ec0f5f9e8e1d9444342263594ab
Subproject commit 83b12a8a265377592dd86d9006e6a4e5a9ada789