Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster 

Conflicts:
	htmlUI/templates/header.tpl
This commit is contained in:
naomiaro 2010-10-01 17:33:13 -04:00
parent eb1678f961 9fc2b3c39b
commit 1e2cef160a
8 changed files with 86 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
conf.php
View File

@ -41,7 +41,7 @@ $CC_CONFIG = array(
'password' => 'test', 'password' => 'test',
'hostspec' => 'localhost', 'hostspec' => 'localhost',
'phptype' => 'pgsql', 'phptype' => 'pgsql',
'database' => 'Campcaster-paul', 'database' => 'campcaster',
), ),
'tblNamePrefix' => 'cc_', 'tblNamePrefix' => 'cc_',
/* ================================================ storage configuration */ /* ================================================ storage configuration */
@ -76,11 +76,11 @@ $CC_CONFIG = array(
'archiveAccountPass' => 'q', 'archiveAccountPass' => 'q',
/* ============================================== scheduler configuration */ /* ============================================== scheduler configuration */
'schedulerUrlPath' => '', // 'schedulerUrlPath' => '',
'schedulerXMLRPC' => 'RC2', // 'schedulerXMLRPC' => 'RC2',
'schedulerUrlHost' => 'localhost', // 'schedulerUrlHost' => 'localhost',
'schedulerUrlPort' => 3344, // 'schedulerUrlPort' => 3344,
'schedulerPass' => 'change_me', // 'schedulerPass' => 'change_me',
/* ==================================== aplication-specific configuration */ /* ==================================== aplication-specific configuration */
'objtypes' => array( 'objtypes' => array(
@ -168,7 +168,7 @@ if (!is_null($this_file)) {
} }
// workaround for missing folders // workaround for missing folders
foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'cronDir') as $d) {
$test = file_exists($CC_CONFIG[$d]); $test = file_exists($CC_CONFIG[$d]);
if ( $test === FALSE ) { if ( $test === FALSE ) {
@mkdir($CC_CONFIG[$d], 02775); @mkdir($CC_CONFIG[$d], 02775);
@ -176,7 +176,8 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
$rp = realpath($CC_CONFIG[$d]); $rp = realpath($CC_CONFIG[$d]);
//echo " * Directory $rp created\n"; //echo " * Directory $rp created\n";
} else { } else {
echo " * Failed creating {$CC_CONFIG[$d]}\n"; echo " * Error: directory {$CC_CONFIG[$d]} was missing.\n";
echo " * I tried to create it, but couldn't, sorry!.\n";
exit(1); exit(1);
} }
} else { } else {
@ -185,4 +186,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
$CC_CONFIG[$d] = $rp; $CC_CONFIG[$d] = $rp;
} }
?> ?>

163
conf.php.template
View File

@ -1,163 +0,0 @@
<?php
/**
* StorageServer configuration file
*
* configuration structure:
*
* <dl>
* <dt>dsn<dd> datasource setting
* <dt>tblNamePrefix <dd>prefix for table names in the database
* <dt>authCookieName <dd>secret token cookie name
* <dt>AdminsGr <dd>name of admin group
* <dt>StationPrefsGr <dd>name of station preferences group
* <dt>AllGr <dd>name of 'all users' group
* <dt>TrashName <dd>name of trash folder (subfolder of the storageRoot)
* <dt>storageDir <dd>main directory for storing binary media files
* <dt>bufferDir <dd>directory for temporary files
* <dt>transDir <dd>directory for incomplete transferred files
* <dt>accessDir <dd>directory for symlinks to accessed files
* <dt>isArchive <dd>local/central flag
* <dt>validate <dd>enable/disable validator
* <dt>useTrash <dd>enable/disable safe delete (move to trash)
* <dt>storageUrlPath<dd>path-URL-part of storageServer base dir
* <dt>storageXMLRPC<dd>XMLRPC server script address relative to storageUrlPath
* <dt>storageUrlHost, storageUrlPort<dd>host and port of storageServer
* <dt>archiveUrlPath<dd>path-URL-part of archiveServer base dir
* <dt>archiveXMLRPC<dd>XMLRPC server script address relative to archiveUrlPath
* <dt>archiveUrlHost, archiveUrlPort<dd>host and port of archiveServer
* <dt>archiveAccountLogin, archiveAccountPass <dd>account info
* for login to archive
* <dt>sysSubjs<dd>system users/groups - cannot be deleted
* <dt>schedulerPass<dd>scheduler's password for storageServer access
* </dl>
*/
include("campcaster_version.php");
// these are the default values for the config
$CC_CONFIG = array(
/* ================================================== basic configuration */
'dsn' => array(
'username' => 'ls_dbuser',
'password' => 'ls_dbpassword',
'hostspec' => 'ls_dbserver',
'phptype' => 'pgsql',
'database' => 'ls_database',
),
'tblNamePrefix' => 'ls_',
/* ================================================ storage configuration */
'authCookieName'=> 'campcaster_session_id',
'AdminsGr' => 'Admins',
'StationPrefsGr'=> 'StationPrefs',
'AllGr' => 'All',
'TrashName' => 'trash_',
'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor',
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
'pearPath' => 'ls_lib_dir/pear',
'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron',
'isArchive' => FALSE,
'validate' => TRUE,
'useTrash' => TRUE,
/* ==================================================== URL configuration */
'storageUrlPath' => 'ls_storageUrlPath',
'storageXMLRPC' => 'xmlrpc/xrLocStor.php',
'storageUrlHost' => 'ls_php_host',
'storageUrlPort' => ls_php_port,
/* ================================================ archive configuration */
'archiveUrlPath' => 'ls_storageUrlPath',
'archiveXMLRPC' => 'xmlrpc/xrLocStor.php',
'archiveUrlHost' => 'ls_php_host',
'archiveUrlPort' => ls_php_port,
'archiveAccountLogin' => 'root',
'archiveAccountPass' => 'q',
/* ============================================== scheduler configuration */
'schedulerUrlPath' => 'ls_scheduler_urlPrefix',
'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix',
'schedulerUrlHost' => 'ls_scheduler_host',
'schedulerUrlPort' => ls_scheduler_port,
'schedulerPass' => 'ls_scheduler_storage_pass',
/* ==================================== aplication-specific configuration */
'objtypes' => array(
'RootNode' => array('Folder'),
'Storage' => array('Folder', 'File', 'Replica'),
'Folder' => array('Folder', 'File', 'Replica'),
'File' => array(),
'audioclip' => array(),
'playlist' => array(),
'Replica' => array(),
),
'allowedActions'=> array(
'RootNode' => array('classes', 'subjects'),
'Folder' => array('editPrivs', 'write', 'read'),
'File' => array('editPrivs', 'write', 'read'),
'audioclip' => array('editPrivs', 'write', 'read'),
'playlist' => array('editPrivs', 'write', 'read'),
'Replica' => array('editPrivs', 'write', 'read'),
'_class' => array('editPrivs', 'write', 'read'),
),
'allActions' => array(
'editPrivs', 'write', 'read', 'classes', 'subjects'
),
/* ============================================== auxiliary configuration */
'RootNode' => 'RootNode',
'tmpRootPass' => 'q',
/* =================================================== cron configuration */
'cronUserName' => 'ls_apache_group',
'lockfile' => dirname(__FILE__).'/cron/cron.lock',
'cronfile' => dirname(__FILE__).'/cron/croncall.php',
'paramdir' => dirname(__FILE__).'/cron/params',
);
// Add database table names
$CC_CONFIG['filesTable'] = $CC_CONFIG['tblNamePrefix'].'files';
$CC_CONFIG['mdataTable'] = $CC_CONFIG['tblNamePrefix'].'mdata';
$CC_CONFIG['accessTable'] = $CC_CONFIG['tblNamePrefix'].'access';
$CC_CONFIG['permTable'] = $CC_CONFIG['tblNamePrefix'].'perms';
$CC_CONFIG['sessTable'] = $CC_CONFIG['tblNamePrefix'].'sess';
$CC_CONFIG['subjTable'] = $CC_CONFIG['tblNamePrefix'].'subjs';
$CC_CONFIG['smembTable'] = $CC_CONFIG['tblNamePrefix'].'smemb';
$CC_CONFIG['classTable'] = $CC_CONFIG['tblNamePrefix'].'classes';
$CC_CONFIG['cmembTable'] = $CC_CONFIG['tblNamePrefix'].'cmemb';
$CC_CONFIG['treeTable'] = $CC_CONFIG['tblNamePrefix'].'tree';
$CC_CONFIG['structTable'] = $CC_CONFIG['tblNamePrefix'].'struct';
$CC_CONFIG['transTable'] = $CC_CONFIG['tblNamePrefix'].'trans';
$CC_CONFIG['prefTable'] = $CC_CONFIG['tblNamePrefix'].'pref';
$CC_CONFIG['playlogTable'] = 'playlog';
$CC_CONFIG['scheduleTable'] = 'schedule';
$CC_CONFIG['backupTable'] = 'backup';
$CC_CONFIG['sysSubjs'] = array(
'root', $CC_CONFIG['AdminsGr'], $CC_CONFIG['AllGr'], $CC_CONFIG['StationPrefsGr']
);
$old_ip = get_include_path();
set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'].PATH_SEPARATOR.$old_ip);
// workaround for missing folders
foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) {
$test = file_exists($CC_CONFIG[$d]);
if ( $test === FALSE ) {
@mkdir($CC_CONFIG[$d], 02775);
if (file_exists($CC_CONFIG[$d])) {
$rp = realpath($CC_CONFIG[$d]);
//echo " * Directory $rp created\n";
} else {
echo " * Failed creating {$CC_CONFIG[$d]}\n";
exit(1);
}
} else {
$rp = realpath($CC_CONFIG[$d]);
}
$CC_CONFIG[$d] = $rp;
}
?>

64
htmlUI/templates/debug.tpl Normal file
View File

@ -0,0 +1,64 @@
{* Smarty *}
{* debug.tpl, last updated version 2.0.1 *}
{assign_debug_info}
{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
<table border=0 width=100%>
<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>
<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>
{section name=templates loop=$_debug_tpls}
<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html}</font>{if isset($_debug_tpls[templates].exec_time)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>
{sectionelse}
<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>
{/section}
<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>
{section name=vars loop=$_debug_keys}
<tr bgcolor={if %vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=blue>{ldelim}${$_debug_keys[vars]}{rdelim}</font></tt></td><td nowrap><tt><font color=green>{$_debug_vals[vars]|@debug_print_var}</font></tt></td></tr>
{sectionelse}
<tr bgcolor=#eeeeee><td colspan=2><tt><i>no template variables assigned</i></tt></td></tr>
{/section}
<tr bgcolor=#cccccc><td colspan=2><b>assigned config file variables (outer template scope):</b></td></tr>
{section name=config_vars loop=$_debug_config_keys}
<tr bgcolor={if %config_vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=maroon>{ldelim}#{$_debug_config_keys[config_vars]}#{rdelim}</font></tt></td><td><tt><font color=green>{$_debug_config_vals[config_vars]|@debug_print_var}</font></tt></td></tr>
{sectionelse}
<tr bgcolor=#eeeeee><td colspan=2><tt><i>no config vars assigned</i></tt></td></tr>
{/section}
</table>
</BODY></HTML>
{else}
<SCRIPT language=javascript>
if( self.name == '' ) {ldelim}
var title = 'Console';
{rdelim}
else {ldelim}
var title = 'Console_' + self.name;
{rdelim}
_smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
_smarty_console.document.write("<HTML><HEAD><TITLE>Smarty Debug Console_"+self.name+"</TITLE></HEAD><BODY bgcolor=#ffffff>");
_smarty_console.document.write("<table border=0 width=100%>");
_smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>");
_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>");
{section name=templates loop=$_debug_tpls}
_smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html|escape:javascript}</font>{if isset($_debug_tpls[templates].exec_time)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>");
{sectionelse}
_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>");
{/section}
_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>");
{section name=vars loop=$_debug_keys}
_smarty_console.document.write("<tr bgcolor={if %vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=blue>{ldelim}${$_debug_keys[vars]}{rdelim}</font></tt></td><td nowrap><tt><font color=green>{$_debug_vals[vars]|@debug_print_var|escape:javascript}</font></tt></td></tr>");
{sectionelse}
_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no template variables assigned</i></tt></td></tr>");
{/section}
_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned config file variables (outer template scope):</b></td></tr>");
{section name=config_vars loop=$_debug_config_keys}
_smarty_console.document.write("<tr bgcolor={if %config_vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=maroon>{ldelim}#{$_debug_config_keys[config_vars]}#{rdelim}</font></tt></td><td><tt><font color=green>{$_debug_config_vals[config_vars]|@debug_print_var|escape:javascript}</font></tt></td></tr>");
{sectionelse}
_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no config vars assigned</i></tt></td></tr>");
{/section}
_smarty_console.document.write("</table>");
_smarty_console.document.write("</BODY></HTML>");
_smarty_console.document.close();
</SCRIPT>
{/if}

8
htmlUI/templates/header.tpl
View File

@ -6,13 +6,13 @@
<title>Campcaster</title> <title>Campcaster</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="htmlUI/html/styles_campcaster.css" rel="stylesheet" type="text/css" /> <link href="htmlUI/html/styles_campcaster.css" rel="stylesheet" type="text/css" />
<link href="htmlUI/html/assets/plupload/plupload.queue.css" rel="stylesheet" type="text/css" /> <link href="htmlUI/html/assets/plupload/plupload.queue.css" rel="stylesheet" type="text/css" />
<link href="htmlUI/html/css/playlist.css" rel="stylesheet" type="text/css" /> <link href="htmlUI/html/css/playlist.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="htmlUI/html/assets/jquery-1.4.2.min.js"></script> <script type="text/javascript" src="htmlUI/html/assets/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="htmlUI/html/assets/jquery-ui-1.8.5.custom.min.js"></script> <script type="text/javascript" src="htmlUI/html/assets/jquery-ui-1.8.5.custom.min.js"></script>
<script type="text/javascript" src="htmlUI/html/assets/plupload/plupload.full.min.js"></script> <script type="text/javascript" src="htmlUI/html/assets/plupload/plupload.full.min.js"></script>
<script type="text/javascript" src="htmlUI/html/assets/plupload/jquery.plupload.queue.min.js"></script> <script type="text/javascript" src="htmlUI/html/assets/plupload/jquery.plupload.queue.min.js"></script>
@ -22,7 +22,7 @@
{include file="script/alttext.js.tpl"} {include file="script/alttext.js.tpl"}
<script type="text/javascript" src="htmlUI/html/js/playlist.js"></script> <script type="text/javascript" src="htmlUI/html/js/playlist.js"></script>
</head> </head>
<body> <body>

2
htmlUI/templates/popup/header.tpl
View File

@ -5,7 +5,7 @@
<head> <head>
<title>Campcaster</title> <title>Campcaster</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="styles_popup.css" rel="stylesheet" type="text/css" /> <link href="htmlUI/html/styles_popup.css" rel="stylesheet" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
{UIBROWSER->getAlertMsg assign='alertMsg'} {UIBROWSER->getAlertMsg assign='alertMsg'}

0
htmlUI/lib/twitter.class.php → htmlUI/twitter.class.php
View File

2
htmlUI/ui_base.inc.php
View File

@ -240,7 +240,7 @@ class uiBase
'CALENDAR' => array('class' => 'uicalendar', 'file' => 'ui_calendar.class.php'), 'CALENDAR' => array('class' => 'uicalendar', 'file' => 'ui_calendar.class.php'),
array('class' => 'jscom', 'file' => 'ui_jscom.php'), array('class' => 'jscom', 'file' => 'ui_jscom.php'),
'TWITTER' => array('class' => 'uitwitter', 'file' => 'ui_twitter.class.php'), 'TWITTER' => array('class' => 'uitwitter', 'file' => 'ui_twitter.class.php'),
array('class' => 'twitter', 'file' => 'lib/twitter.class.php') array('class' => 'twitter', 'file' => 'twitter.class.php')
); );

12
htmlUI/ui_handler.php
View File

@ -19,9 +19,9 @@ switch ($_REQUEST['act']) {
# $uiHandler->PLAYLIST->reportLookedPL(); # $uiHandler->PLAYLIST->reportLookedPL();
$uiHandler->PLAYLIST->loadLookedFromPref(); $uiHandler->PLAYLIST->loadLookedFromPref();
} }
include('/templates/loader/index.tpl'); include(dirname(__FILE__).'/htmlUI/templates/loader/index.tpl');
include('/templates/popup/_reload_parent.tpl'); include(dirname(__FILE__).'/htmlUI/templates/popup/_reload_parent.tpl');
include('/templates/popup/_close.tpl'); include(dirname(__FILE__).'/htmlUI/templates/popup/_close.tpl');
exit; exit;
case "logout": case "logout":
@ -323,11 +323,11 @@ switch ($_REQUEST['act']) {
break; break;
case "PL.setClipLength": case "PL.setClipLength":
$uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']); $uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']);
break; break;
case "PL.setFadeLength": case "PL.setFadeLength":
$uiHandler->PLAYLIST->setFadeLength($_REQUEST['pos'], $_REQUEST['fadeIn'], $_REQUEST['fadeOut']); $uiHandler->PLAYLIST->setFadeLength($_REQUEST['pos'], $_REQUEST['fadeIn'], $_REQUEST['fadeOut']);
break; break;
case "PL.removeItem": case "PL.removeItem":