Skip to content

スマホ対応版の動画配信モジュールをコミット #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kteraguchi merged 2 commits into from
Dec 5, 2013
Merged

スマホ対応版の動画配信モジュールをコミット #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42bcff9
スマホ対応
Aug 28, 2013
a590959
不要なコメントを削除
Aug 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions multimedia/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
NetComomns2-multimedia Changelog
===============================

/* FIXME */
2013/08/28: Version 2.4.0.1
===============================
- スマホ対応（Android、iOS）
- IE以外で、一覧表示の状態でチャンネル編集リンクをクリックした際にブロックが表示されなくなるバグを修正


2013/05/20: Version 2.4.0.1
===============================
- ルームのリストア時にタグデータの重複エラーが発生することがあるバグを修正
Expand Down
74 changes: 37 additions & 37 deletions multimedia/action/main/album/delete/Delete.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?php

/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */

/**
* アルバム削除アクションクラス
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
* @copyright 2006-2007 NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @project NetCommons Project, supported by National Institute of Informatics
* @access public
*/
class Multimedia_Action_Main_Album_Delete extends Action
{
// バリデートによりセット
var $album = null;

// 使用コンポーネントを受け取るため
var $multimediaAction = null;

/**
* アルバム削除アクション
*
* @access public
*/
function execute()
{
if (!$this->multimediaAction->deleteAlbum($this->album['multimedia_id'], $this->album['album_id'])) {
return 'error';
}

return 'success';
}
}
?>
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* アルバム削除アクションクラス
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
* @copyright 2006-2007 NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @project NetCommons Project, supported by National Institute of Informatics
* @access public
*/
class Multimedia_Action_Main_Album_Delete extends Action
{
// バリデートによりセット
var $album = null;
// 使用コンポーネントを受け取るため
var $multimediaAction = null;
/**
* アルバム削除アクション
*
* @access public
*/
function execute()
{
if (!$this->multimediaAction->deleteAlbum($this->album['multimedia_id'], $this->album['album_id'])) {
return 'error';
}
return 'success';
}
}
?>
134 changes: 67 additions & 67 deletions multimedia/action/main/album/entry/Entry.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
<?php

/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */

/**
* 動画配信アルバム登録処理
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
* @copyright 2006-2007 NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @project NetCommons Project, supported by National Institute of Informatics
* @access public
*/
class Multimedia_Action_Main_Album_Entry extends Action
{
// リクエストパラメータを受け取るため
var $block_id = null;
var $multimedia_id = null;
var $album_id = null;
var $album_name = null;
var $album_description = null;
var $album_jacket = null;
var $upload_id = null;
var $public_flag = null;

// バリデートによりセット
var $multimedia_obj = null;

// コンポーネントを受け取るため
var $db = null;
var $multimediaView = null;

function execute()
{
if (empty($this->upload_id)) {
$imageSize = $this->multimediaView->getImageSize($this->album_jacket);
} else {
$imageSize = $this->multimediaView->getImageSize($this->upload_id);
}

$params = array(
"album_name" => $this->album_name,
"upload_id" => $this->upload_id,
"album_jacket" => $this->album_jacket,
"width" => $imageSize[0],
"height" => $imageSize[1],
"album_description" => $this->album_description,
"public_flag" => intval($this->public_flag)
);

if (empty($this->album_id)) {
$params["multimedia_id"] = $this->multimedia_id;
$albumSequence = $this->db->maxExecute("multimedia_album", "album_sequence", array("multimedia_id" => $this->multimedia_id));
$params["album_sequence"] = $albumSequence + 1;
$result = $this->db->insertExecute("multimedia_album", $params, true, "album_id");
} else {
$result = $this->db->updateExecute("multimedia_album", $params, array("album_id" => $this->album_id), true);
}
if ($result === false) {
return 'error';
}

return 'success';
}
}
?>
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* 動画配信アルバム登録処理
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
* @copyright 2006-2007 NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @project NetCommons Project, supported by National Institute of Informatics
* @access public
*/
class Multimedia_Action_Main_Album_Entry extends Action
{
// リクエストパラメータを受け取るため
var $block_id = null;
var $multimedia_id = null;
var $album_id = null;
var $album_name = null;
var $album_description = null;
var $album_jacket = null;
var $upload_id = null;
var $public_flag = null;
// バリデートによりセット
var $multimedia_obj = null;
// コンポーネントを受け取るため
var $db = null;
var $multimediaView = null;
function execute()
{
if (empty($this->upload_id)) {
$imageSize = $this->multimediaView->getImageSize($this->album_jacket);
} else {
$imageSize = $this->multimediaView->getImageSize($this->upload_id);
}
$params = array(
"album_name" => $this->album_name,
"upload_id" => $this->upload_id,
"album_jacket" => $this->album_jacket,
"width" => $imageSize[0],
"height" => $imageSize[1],
"album_description" => $this->album_description,
"public_flag" => intval($this->public_flag)
);
if (empty($this->album_id)) {
$params["multimedia_id"] = $this->multimedia_id;
$albumSequence = $this->db->maxExecute("multimedia_album", "album_sequence", array("multimedia_id" => $this->multimedia_id));
$params["album_sequence"] = $albumSequence + 1;
$result = $this->db->insertExecute("multimedia_album", $params, true, "album_id");
} else {
$result = $this->db->updateExecute("multimedia_album", $params, array("album_id" => $this->album_id), true);
}
if ($result === false) {
return 'error';
}
return 'success';
}
}
?>
40 changes: 20 additions & 20 deletions multimedia/action/main/album/jacket/Jacket.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?php

class Multimedia_Action_Main_Album_Jacket extends Action
{
var $uploadsAction = null;
var $session = null;

/**
* ジャケットアップロードアクション
*
* @access public
*/
function execute()
{
$files = $this->uploadsAction->uploads();
$this->session->setParameter("multimedia_jacket_upload_id", $files[0]["upload_id"]);

return true;
}
}
<?php
class Multimedia_Action_Main_Album_Jacket extends Action
{
var $uploadsAction = null;
var $session = null;
/**
* ジャケットアップロードアクション
*
* @access public
*/
function execute()
{
$files = $this->uploadsAction->uploads();
$this->session->setParameter("multimedia_jacket_upload_id", $files[0]["upload_id"]);
return true;
}
}
?>
80 changes: 40 additions & 40 deletions multimedia/action/main/comment/delete/Delete.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<?php

/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */

/**
* コメント削除アクションクラス
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
* @copyright 2006-2007 NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @project NetCommons Project, supported by National Institute of Informatics
* @access public
*/
class Multimedia_Action_Main_Comment_Delete extends Action
{
// リクエストパラメータを受け取るため
var $comment_id = null;

// 使用コンポーネントを受け取るため
var $db = null;

/**
* コメント削除アクション
*
* @access public
*/
function execute()
{
$params = array(
"comment_id" => $this->comment_id
);
if (!$this->db->deleteExecute("multimedia_comment", $params)) {
return 'error';
}

return 'success';
}
}
?>
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* コメント削除アクションクラス
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
* @copyright 2006-2007 NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @project NetCommons Project, supported by National Institute of Informatics
* @access public
*/
class Multimedia_Action_Main_Comment_Delete extends Action
{
// リクエストパラメータを受け取るため
var $comment_id = null;
// 使用コンポーネントを受け取るため
var $db = null;
/**
* コメント削除アクション
*
* @access public
*/
function execute()
{
$params = array(
"comment_id" => $this->comment_id
);
if (!$this->db->deleteExecute("multimedia_comment", $params)) {
return 'error';
}
return 'success';
}
}
?>
Loading