fix #312 - Удаление закрывающего тега "?>"

application/classes/actions/ActionAdmin.class.php

@@ -477,5 +477,4 @@ class ActionAdmin extends Action {
 		 */
 		$this->Viewer_Assign('sMenuHeadItemSelect',$this->sMenuHeadItemSelect);
 	}
-}
-?>
+}

application/classes/actions/ActionComments.class.php

@@ -133,5 +133,4 @@ class ActionComments extends Action {
 		 */
 		$this->Viewer_Assign('sMenuHeadItemSelect',$this->sMenuHeadItemSelect);
 	}
-}
-?>
+}

application/classes/actions/ActionContent.class.php

@@ -545,5 +545,4 @@ class ActionContent extends Action {
 		$this->Viewer_Assign('sMenuItemSelect',$this->sMenuItemSelect);
 		$this->Viewer_Assign('sMenuSubItemSelect',$this->sMenuSubItemSelect);
 	}
-}
-?>
+}

application/classes/actions/ActionError.class.php

@@ -88,5 +88,4 @@ class ActionError extends Action {
 		$this->Viewer_AddHtmlTitle($this->Lang_Get('error'));
 		$this->SetTemplateAction('index');
 	}
-}
-?>
+}

application/classes/actions/ActionIndex.class.php

@@ -327,5 +327,4 @@ class ActionIndex extends Action {
 		$this->Viewer_Assign('iCountTopicsSubNew',$this->iCountTopicsNew);
 		$this->Viewer_Assign('sNavTopicsSubUrl',$this->sNavTopicsSubUrl);
 	}
-}
-?>
+}

application/classes/actions/ActionLogin.class.php

@@ -240,5 +240,4 @@ class ActionLogin extends Action {
 			return Router::Action('error');
 		}
 	}
-}
-?>
+}

application/classes/actions/ActionMy.class.php

@@ -107,5 +107,4 @@ class ActionMy extends Action {
 		$sPage=$iPage==1 ? '' : "page{$iPage}/";
 		Router::Location($this->oUserProfile->getUserWebPath().'created/comments/'.$sPage);
 	}
-}
-?>
+}

application/classes/actions/ActionPersonalBlog.class.php

@@ -160,5 +160,4 @@ class ActionPersonalBlog extends Action {
 		$this->Viewer_Assign('iCountTopicsSubNew',$iCountTopicsPersonalNew);
 		$this->Viewer_Assign('sNavTopicsSubUrl',$this->sNavTopicsSubUrl);
 	}
-}
-?>
+}

application/classes/actions/ActionRegistration.class.php

@@ -349,5 +349,4 @@ class ActionRegistration extends Action {
 	 */
 	protected function EventConfirm() {
 	}
-}
-?>
+}

application/classes/actions/ActionRss.class.php

@@ -374,5 +374,4 @@ class ActionRss extends Action {
 		}
 		return $sText;
 	}
-}
-?>
+}

application/classes/actions/ActionTag.class.php

@@ -104,5 +104,4 @@ class ActionTag extends Action {
 		 */
 		$this->Viewer_Assign('sMenuHeadItemSelect',$this->sMenuHeadItemSelect);
 	}
-}
-?>
+}

application/classes/blocks/BlockBlogNav.class.php

@@ -54,5 +54,4 @@ class BlockBlogNav extends Block {
 			$this->Viewer_Assign("aNavigatorBlogs",$aResult['collection']);
 		}
 	}
-}
-?>
+}

application/classes/blocks/BlockBlogs.class.php

@@ -40,5 +40,4 @@ class BlockBlogs extends Block {
 			$this->Viewer_Assign('sBlogsTop',$sTextResult);
 		}
 	}
-}
-?>
+}

application/classes/blocks/BlockBlogsSearch.class.php

@@ -34,5 +34,4 @@ class BlockBlogsSearch extends Block {
 		$this->Viewer_Assign("aBlogCategories",$aCategories);
 		$this->Viewer_Assign("iCountBlogsAll",$aBlogsAll['count']);
 	}
-}
-?>
+}

application/classes/blocks/BlockStream.class.php

@@ -39,5 +39,4 @@ class BlockStream extends Block {
 			$this->Viewer_Assign('sStreamComments',$sTextResult);
 		}
 	}
-}
-?>
+}

application/classes/blocks/BlockTags.class.php

@@ -57,5 +57,4 @@ class BlockTags extends Block {
 			}
 		}
 	}
-}
-?>
+}

application/classes/blocks/BlockTagsCity.class.php

@@ -39,5 +39,4 @@ class BlockTagsCity extends Block {
 		 */
 		$this->Viewer_Assign("aCityList",$aCities);
 	}
-}
-?>
+}

application/classes/blocks/BlockTagsCountry.class.php

@@ -39,5 +39,4 @@ class BlockTagsCountry extends Block {
 		 */
 		$this->Viewer_Assign("aCountryList",$aCountries);
 	}
-}
-?>
+}

application/classes/blocks/BlockTagsFavouriteTopic.class.php

@@ -60,5 +60,4 @@ class BlockTagsFavouriteTopic extends Block {
 			$this->Viewer_Assign("oFavouriteUser",$oUser);
 		}
 	}
-}
-?>
+}

application/classes/hooks/HookCopyright.class.php

@@ -39,5 +39,4 @@ class HookCopyright extends Hook {
 		 */
 		return '&copy; Powered by <a href="http://livestreetcms.org">LiveStreet CMS</a>';
 	}
-}
-?>
+}

application/classes/hooks/HookMain.class.php

@@ -51,5 +51,4 @@ class HookMain extends Hook {
 		 */
 		$this->Ls_SenderRun();
 	}
-}
-?>
+}

application/classes/hooks/HookStatisticsPerformance.class.php

@@ -53,5 +53,4 @@ class HookStatisticsPerformance extends Hook {
 		 */
 		return $this->Viewer_Fetch('actions/ActionAdmin/statistics_performance.tpl');
 	}
-}
-?>
+}

application/classes/modules/acl/ACL.class.php

@@ -571,5 +571,4 @@ class ModuleACL extends Module {
 		}
 		return true;
 	}
-}
-?>
+}

application/classes/modules/blog/Blog.class.php

@@ -1166,5 +1166,4 @@ class ModuleBlog extends Module {
 		$this->Cache_Clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG,array('blog_update'));
 		return $res;
 	}
-}
-?>
+}

application/classes/modules/blog/entity/Blog.entity.class.php

@@ -381,5 +381,4 @@ class ModuleBlog_EntityBlog extends Entity {
 	public function setVote($data) {
 		$this->_aData['vote']=$data;
 	}
-}
-?>
+}

application/classes/modules/blog/entity/BlogCategory.entity.class.php

@@ -78,5 +78,4 @@ class ModuleBlog_EntityBlogCategory extends Entity {
 	public function getUrlWeb() {
 		return Router::GetPath('blogs').$this->getUrlFull().'/';
 	}
-}
-?>
+}

application/classes/modules/blog/entity/BlogUser.entity.class.php

@@ -146,5 +146,4 @@ class ModuleBlog_EntityBlogUser extends Entity {
 	public function setUser($data) {
 		$this->_aData['user']=$data;
 	}
-}
-?>
+}

application/classes/modules/blog/mapper/Blog.mapper.class.php

@@ -785,5 +785,4 @@ class ModuleBlog_MapperBlog extends Mapper {
 		}
 		return $aResult;
 	}
-}
-?>
+}

application/classes/modules/comment/Comment.class.php

@@ -960,5 +960,4 @@ class ModuleComment extends Module {
 	public function GetCommentItemsByArrayId($aCommentId) {
 		return $this->GetCommentsByArrayId($aCommentId);
 	}
-}
-?>
+}

application/classes/modules/comment/entity/Comment.entity.class.php

@@ -466,5 +466,4 @@ class ModuleComment_EntityComment extends Entity {
 	public function setCountFavourite($data) {
 		$this->_aData['comment_count_favourite']=$data;
 	}
-}
-?>
+}

application/classes/modules/comment/entity/CommentOnline.entity.class.php

@@ -87,5 +87,4 @@ class ModuleComment_EntityCommentOnline extends Entity {
 	public function setTargetParentId($data) {
 		$this->_aData['target_parent_id']=$data;
 	}
-}
-?>
+}

application/classes/modules/comment/mapper/Comment.mapper.class.php

@@ -928,5 +928,4 @@ class ModuleComment_MapperComment extends Mapper {
 		}
 		return $aResult;
 	}
-}
-?>
+}

application/classes/modules/favourite/Favourite.class.php

@@ -469,5 +469,4 @@ class ModuleFavourite extends Module {
 		}
 		return false;
 	}
-}
-?>
+}

application/classes/modules/favourite/entity/Favourite.entity.class.php

@@ -98,5 +98,4 @@ class ModuleFavourite_EntityFavourite extends Entity {
 	public function setTargetType($data) {
 		$this->_aData['target_type']=$data;
 	}
-}
-?>
+}

application/classes/modules/favourite/entity/Tag.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleFavourite_EntityTag extends Entity {
 
-}
-?>
+}

application/classes/modules/favourite/mapper/Favourite.mapper.class.php

@@ -539,5 +539,4 @@ class ModuleFavourite_MapperFavourite extends Mapper {
 		}
 		return $aResult;
 	}
-}
-?>
+}

application/classes/modules/geo/Geo.class.php

@@ -419,5 +419,4 @@ class ModuleGeo extends Module {
 		}
 		return false;
 	}
-}
-?>
+}

application/classes/modules/geo/entity/City.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleGeo_EntityCity extends ModuleGeo_EntityGeo {
 
-}
-?>
+}

application/classes/modules/geo/entity/Country.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleGeo_EntityCountry extends ModuleGeo_EntityGeo {
 
-}
-?>
+}

application/classes/modules/geo/entity/Geo.entity.class.php

@@ -114,5 +114,4 @@ class ModuleGeo_EntityGeo extends Entity {
 		}
 		return null;
 	}
-}
-?>
+}

application/classes/modules/geo/entity/Region.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleGeo_EntityRegion extends ModuleGeo_EntityGeo {
 
-}
-?>
+}

application/classes/modules/geo/entity/Target.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleGeo_EntityTarget extends Entity {
     
-}
-?>
+}

application/classes/modules/geo/mapper/Geo.mapper.class.php

@@ -365,5 +365,4 @@ class ModuleGeo_MapperGeo extends Mapper {
 		}
 		return $aResult;
 	}
-}
-?>
+}

application/classes/modules/notify/Notify.class.php

@@ -566,5 +566,4 @@ class ModuleNotify extends Module {
 			return $this->sDir.'/'.$this->Lang_GetLangDefault().'/'.$sName;
 		}
 	}
-}
-?>
+}

application/classes/modules/notify/entity/Task.entity.class.php

@@ -136,5 +136,4 @@ class ModuleNotify_EntityTask extends Entity {
 	public function setNotifySubject($data) {
 		$this->_aData['notify_subject']=$data;
 	}
-}
-?>
+}

application/classes/modules/notify/mapper/Notify.mapper.class.php

@@ -130,5 +130,4 @@ class ModuleNotify_MapperNotify extends Mapper {
 		}
 		return $aTasks;
 	}
-}
-?>
+}

application/classes/modules/rating/Rating.class.php

@@ -200,5 +200,4 @@ class ModuleRating extends Module {
 		$oUserTarget->setRating($iRatingNew);
 		return $iValue*$iDelta;
 	}
-}
-?>
+}

application/classes/modules/stream/entity/Event.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleStream_EntityEvent extends Entity {
 
-}
-?>
+}

application/classes/modules/subscribe/Subscribe.class.php

@@ -297,5 +297,4 @@ class ModuleSubscribe extends Module {
 		}
 		return false;
 	}
-}
-?>
+}

application/classes/modules/subscribe/entity/Subscribe.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleSubscribe_EntitySubscribe extends Entity {
 
-}
-?>
+}

application/classes/modules/subscribe/mapper/Subscribe.mapper.class.php

@@ -145,5 +145,4 @@ class ModuleSubscribe_MapperSubscribe extends Mapper {
 		}
 		return $aResult;
 	}
-}
-?>
+}

application/classes/modules/talk/Talk.class.php

@@ -801,5 +801,4 @@ class ModuleTalk extends Module {
 		 */
 		$this->Media_RemoveTarget('talk',$iTalkId,true);
 	}
-}
-?>
+}

application/classes/modules/talk/entity/Talk.entity.class.php

@@ -278,5 +278,4 @@ class ModuleTalk_EntityTalk extends Entity {
 	public function setTalkUsers($data) {
 		$this->_aData['talk_users']=$data;
 	}
-}
-?>
+}

application/classes/modules/talk/entity/TalkUser.entity.class.php

@@ -137,5 +137,4 @@ class ModuleTalk_EntityTalkUser extends Entity {
 	public function setUser($data) {
 		$this->_aData['user']=$data;
 	}
-}
-?>
+}

application/classes/modules/talk/mapper/Talk.mapper.class.php

@@ -552,5 +552,4 @@ class ModuleTalk_MapperTalk extends Mapper {
 		}
 		return $bOk;
 	}
-}
-?>
+}

application/classes/modules/topic/entity/TopicRead.entity.class.php

@@ -104,5 +104,4 @@ class ModuleTopic_EntityTopicRead extends Entity {
 	public function setCommentIdLast($data) {
 		$this->_aData['comment_id_last']=$data;
 	}
-}
-?>
+}

application/classes/modules/topic/entity/TopicTag.entity.class.php

@@ -129,5 +129,4 @@ class ModuleTopic_EntityTopicTag extends Entity {
 	public function setSize($data) {
 		$this->_aData['size']=$data;
 	}
-}
-?>
+}

application/classes/modules/user/User.class.php

@@ -1556,5 +1556,4 @@ class ModuleUser extends Module {
 		}
 		return false;
 	}
-}
-?>
+}

application/classes/modules/user/entity/Changemail.entity.class.php

@@ -23,5 +23,4 @@
  */
 class ModuleUser_EntityChangemail extends Entity {
 
-}
-?>
+}

application/classes/modules/user/entity/Friend.entity.class.php

@@ -164,5 +164,4 @@ class ModuleUser_EntityFriend extends Entity {
 		}
 		return false;
 	}
-}
-?>
+}

application/classes/modules/user/entity/Invite.entity.class.php

@@ -136,5 +136,4 @@ class ModuleUser_EntityInvite extends Entity {
 	public function setUsed($data) {
 		$this->_aData['invite_used']=$data;
 	}
-}
-?>
+}

application/classes/modules/user/entity/Note.entity.class.php

@@ -51,5 +51,4 @@ class ModuleUser_EntityNote extends Entity {
 		}
 		return $this->Lang_Get('user_note.notices.target_error');
 	}
-}
-?>
+}

application/classes/modules/user/entity/Reminder.entity.class.php

@@ -119,5 +119,4 @@ class ModuleUser_EntityReminder extends Entity {
 	public function setIsUsed($data) {
 		$this->_aData['reminde_is_used']=$data;
 	}
-}
-?>
+}

application/classes/modules/user/entity/Session.entity.class.php

@@ -120,5 +120,4 @@ class ModuleUser_EntitySession extends Entity {
 	public function setDateLast($data) {
 		$this->_aData['session_date_last']=$data;
 	}
-}
-?>
+}

application/classes/modules/user/entity/User.entity.class.php

@@ -738,5 +738,4 @@ class ModuleUser_EntityUser extends Entity {
 	public function setUserFriend($data) {
 		$this->_aData['user_friend']=$data;
 	}
-}
-?>
+}

application/classes/modules/user/mapper/User.mapper.class.php

@@ -1280,5 +1280,4 @@ class ModuleUser_MapperUser extends Mapper {
 		}
 		return $aReturn;
 	}
-}
-?>
+}

application/classes/modules/vote/Vote.class.php

@@ -180,5 +180,4 @@ class ModuleVote extends Module {
 		$this->Cache_Clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG,array("vote_update_{$sTargetType}"));
 		return $this->oMapper->DeleteVoteByTarget($aTargetId,$sTargetType);
 	}
-}
-?>
+}

application/classes/modules/vote/entity/Vote.entity.class.php

@@ -136,5 +136,4 @@ class ModuleVote_EntityVote extends Entity {
 	public function setIp($data) {
 		$this->_aData['vote_ip']=$data;
 	}
-}
-?>
+}

application/classes/modules/vote/mapper/Vote.mapper.class.php

@@ -94,5 +94,4 @@ class ModuleVote_MapperVote extends Mapper {
 		$res=$this->oDb->query($sql,$aTargetId,$sTargetType);
 		return $res===false or is_null($res) ? false : true;
 	}
-}
-?>
+}

application/classes/modules/wall/Wall.class.php

@@ -247,5 +247,4 @@ class ModuleWall extends Module {
 			$this->UpdatePidWall($oWallParent);
 		}
 	}
-}
-?>
+}

application/classes/modules/wall/entity/Wall.entity.class.php

@@ -118,5 +118,4 @@ class ModuleWall_EntityWall extends Entity {
 	public function getUrlWall() {
 		return $this->getWallUser()->getUserWebPath().'wall/';
 	}
-}
-?>
+}

application/classes/modules/wall/mapper/Wall.mapper.class.php

@@ -194,5 +194,4 @@ class ModuleWall_MapperWall extends Mapper {
 		}
 		return $aResult;
 	}
-}
-?>
+}

application/config/config.local.php.dist

@@ -30,5 +30,4 @@ $config['db']['params']['type']   = 'mysqli';
 $config['db']['params']['dbname'] = 'social';
 $config['db']['table']['prefix'] = 'prefix_';
 
-return $config;
-?>
+return $config;

application/config/config.stable.php.dist

@@ -29,5 +29,4 @@ $config['db']['params']['pass']   = '';
 $config['db']['params']['type']   = 'mysqli';
 $config['db']['params']['dbname'] = 'social';
 
-return $config;
-?>
+return $config;

application/config/config.test.php.dist

@@ -39,5 +39,4 @@ $config['module']['user']['captcha_use_registration'] = false;  // провер
 $config['lang']['current'] = 'english';
 $config['lang']['default'] = 'english';
 
-return $config;
-?>
+return $config;

application/frontend/i18n/en.php

@@ -1232,5 +1232,4 @@ return array(
 		'13' => '[UTC + 13] Tonga Time, Phoenix Islands Time, Kamchatka Time',
 		'14' => '[UTC + 14] Line Island Time'
 	)
-);
-?>
+);

application/frontend/i18n/ru.php

@@ -1389,5 +1389,4 @@ return array(
 		'13' => '[UTC + 13] Острова Феникс, Тонга',
 		'14' => '[UTC + 14] Остров Лайн'
 	)
-);
-?>
+);

application/utilities/cron/notify.php

@@ -55,5 +55,4 @@ $sLockFilePath=Config::Get('sys.cache.dir').'notify.lock';
  * передавая параметром путь к лок-файлу
  */
 $app=new NotifyCron($sLockFilePath);
-print $app->Exec();
-?>
+print $app->Exec();

application/utilities/cron/template.php

@@ -45,5 +45,4 @@ class TemplateCacheCleanCron extends Cron {
  * Создаем объект крон-процесса 
  */
 $app=new TemplateCacheCleanCron();
-print $app->Exec();
-?>
+print $app->Exec();

framework

@@ -1 +1 @@
-Subproject commit 951cb452e48653762efdc99cf2b1d879c4803262
+Subproject commit 73b47c15a5c98a0f5b7ac4c0ecdecf5b0f194101