mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 

Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
This commit is contained in:
Michael Gapczynski 2012-06-13 15:17:46 -04:00
parent bd01e93469 f9bf34340c
commit b5889d6ffe
23 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/calendar/index.php
View File

@ -54,9 +54,9 @@ OCP\Util::addscript('contacts','jquery.multi-autocomplete');
OCP\Util::addscript('','oc-vcategories'); OCP\Util::addscript('','oc-vcategories');
OCP\App::setActiveNavigationEntry('calendar_index'); OCP\App::setActiveNavigationEntry('calendar_index');
$tmpl = new OCP\Template('calendar', 'calendar', 'user'); $tmpl = new OCP\Template('calendar', 'calendar', 'user');
$tmpl->assign('eventSources', $eventSources); $tmpl->assign('eventSources', $eventSources,false);
$tmpl->assign('categories', $categories); $tmpl->assign('categories', $categories);
if(array_key_exists('showevent', $_GET)){ if(array_key_exists('showevent', $_GET)){
$tmpl->assign('showevent', $_GET['showevent']); $tmpl->assign('showevent', $_GET['showevent'], false);
} }
$tmpl->printPage(); $tmpl->printPage();

4
apps/calendar/lib/app.php
View File

@ -377,8 +377,8 @@ class OC_Calendar_App{
$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0; $lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
$output = array('id'=>(int)$event['id'], $output = array('id'=>(int)$event['id'],
'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')), 'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'', 'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
'lastmodified'=>$lastmodified); 'lastmodified'=>$lastmodified);
$dtstart = $vevent->DTSTART; $dtstart = $vevent->DTSTART;

4
apps/calendar/templates/part.choosecalendar.rowfields.php
View File

@ -1,8 +1,8 @@
<?php <?php
echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>'; echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>';
echo '<td id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . htmlspecialchars($_['calendar']['displayname']) . '</label></td>'; echo '<td id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . $_['calendar']['displayname'] . '</label></td>';
echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>'; echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>';
echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . htmlentities($_['calendar']['uri']) . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>'; echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>';
echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>'; echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>';
echo '<td width="20px"><a href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/rename.svg').'"></a></td>'; echo '<td width="20px"><a href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/rename.svg').'"></a></td>';
echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></td>'; echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></td>';

2
apps/calendar/templates/part.choosecalendar.rowfields.shared.php
View File

@ -1,4 +1,4 @@
<?php <?php
echo '<td width="20px"><input id="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Share.activation(this,\'' . $_['share']['owner'] . '\',' . $_['share']['calendar']['id'] . ')"' . ($_['share']['active'] ? ' checked="checked"' : '') . '></td>'; echo '<td width="20px"><input id="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Share.activation(this,\'' . $_['share']['owner'] . '\',' . $_['share']['calendar']['id'] . ')"' . ($_['share']['active'] ? ' checked="checked"' : '') . '></td>';
echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . htmlspecialchars($_['share']['calendar']['displayname']) . '</label></td>'; echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . $_['share']['calendar']['displayname'] . '</label></td>';
echo '<td style="font-style: italic;">' . $l->t('shared with you by') . ' ' . $_['share']['owner'] . '</td>'; echo '<td style="font-style: italic;">' . $l->t('shared with you by') . ' ' . $_['share']['owner'] . '</td>';

8
apps/calendar/templates/part.eventform.php
View File

@ -18,7 +18,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
<tr> <tr>
<th width="75px"><?php echo $l->t("Title");?>:</th> <th width="75px"><?php echo $l->t("Title");?>:</th>
<td> <td>
<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?>" maxlength="100" name="title"/> <input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
</td> </td>
</tr> </tr>
</table> </table>
@ -26,7 +26,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
<tr> <tr>
<th width="75px"><?php echo $l->t("Category");?>:</th> <th width="75px"><?php echo $l->t("Category");?>:</th>
<td> <td>
<input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>"> <input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
<a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a> <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
</td> </td>
<?php if(count($_['calendar_options']) > 1) { ?> <?php if(count($_['calendar_options']) > 1) { ?>
@ -80,7 +80,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
<tr> <tr>
<th width="85px"><?php echo $l->t("Location");?>:</th> <th width="85px"><?php echo $l->t("Location");?>:</th>
<td> <td>
<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?>" maxlength="100" name="location" /> <input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100" name="location" />
</td> </td>
</tr> </tr>
</table> </table>
@ -88,7 +88,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
<tr> <tr>
<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th> <th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
<td> <td>
<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea> <textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
</td> </td>
</tr> </tr>
</table> </table>

2
apps/calendar/templates/part.import.php
View File

@ -9,7 +9,7 @@
$calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()); $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
$calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar')); $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
for($i = 0;$i<count($calendar_options);$i++){ for($i = 0;$i<count($calendar_options);$i++){
$calendar_options[$i]['displayname'] = htmlspecialchars($calendar_options[$i]['displayname']); $calendar_options[$i]['displayname'] = $calendar_options[$i]['displayname'];
} }
echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname')); echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
?> ?>

6
apps/calendar/templates/part.showevent.php
View File

@ -10,7 +10,7 @@
<tr> <tr>
<th width="75px"><?php echo $l->t("Title");?>:</th> <th width="75px"><?php echo $l->t("Title");?>:</th>
<td> <td>
<?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?> <?php echo isset($_['title']) ? $_['title'] : '' ?>
</td> </td>
</tr> </tr>
</table> </table>
@ -79,7 +79,7 @@
<tr> <tr>
<th width="85px"><?php echo $l->t("Location");?>:</th> <th width="85px"><?php echo $l->t("Location");?>:</th>
<td> <td>
<?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?> <?php echo isset($_['location']) ? $_['location'] : '' ?>
</td> </td>
</tr> </tr>
</table> </table>
@ -87,7 +87,7 @@
<tr> <tr>
<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th> <th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
<td> <td>
<?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea> <?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
</tr> </tr>
</table> </table>
</div> </div>

2
apps/contacts/templates/part.contacts.php
View File

@ -8,5 +8,5 @@
} }
} }
?> ?>
<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li> <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
<?php endforeach; ?> <?php endforeach; ?>

2
apps/files/ajax/list.php
View File

@ -38,7 +38,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
} }
$list = new OCP\Template( "files", "part.list", "" ); $list = new OCP\Template( "files", "part.list", "" );
$list->assign( "files", $files ); $list->assign( "files", $files, false );
$data = array('files' => $list->fetchPage()); $data = array('files' => $list->fetchPage());
OCP\JSON::success(array('data' => $data)); OCP\JSON::success(array('data' => $data));

14
apps/files/index.php
View File

@ -73,12 +73,12 @@ foreach( explode( '/', $dir ) as $i ){
// make breadcrumb und filelist markup // make breadcrumb und filelist markup
$list = new OCP\Template( 'files', 'part.list', '' ); $list = new OCP\Template( 'files', 'part.list', '' );
$list->assign( 'files', $files ); $list->assign( 'files', $files, false );
$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir='); $list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=', false);
$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file='); $list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=', false);
$breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' ); $breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
$breadcrumbNav->assign( 'breadcrumb', $breadcrumb ); $breadcrumbNav->assign( 'breadcrumb', $breadcrumb, false );
$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir='); $breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=', false);
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
@ -89,8 +89,8 @@ $freeSpace=max($freeSpace,0);
$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace); $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
$tmpl = new OCP\Template( 'files', 'index', 'user' ); $tmpl = new OCP\Template( 'files', 'index', 'user' );
$tmpl->assign( 'fileList', $list->fetchPage() ); $tmpl->assign( 'fileList', $list->fetchPage(), false );
$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage() ); $tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
$tmpl->assign( 'dir', $dir); $tmpl->assign( 'dir', $dir);
$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/')); $tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
$tmpl->assign( 'files', $files ); $tmpl->assign( 'files', $files );

2
apps/files/templates/index.php
View File

@ -15,7 +15,7 @@
<form data-upload-id='1' class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1"> <form data-upload-id='1' class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
<input type="hidden" name="dir" value="<?php echo htmlentities($_['dir'],ENT_COMPAT,'utf-8') ?>" id="dir"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
<button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload-white.svg"); ?>" /></button> <button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload-white.svg"); ?>" /></button>
<input class="file_upload_start" type="file" name='files[]'/> <input class="file_upload_start" type="file" name='files[]'/>
<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>

2
apps/files_external/templates/settings.php
View File

@ -16,7 +16,7 @@
<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?> <?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
<?php foreach ($_['mounts'] as $mountPoint => $mount): ?> <?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
<tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>> <tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>>
<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo htmlentities($mountPoint); ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td> <td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
<?php if ($mountPoint == ''): ?> <?php if ($mountPoint == ''): ?>
<td class="backend"> <td class="backend">
<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'> <select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>

4
apps/gallery/lib/tiles.php
View File

@ -141,7 +141,7 @@ class TileStack extends TileBase {
} }
public function get() { public function get() {
$r = '<div class="title gallery_div">'.htmlentities($this->stack_name).'</div>'; $r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
for ($i = 0; $i < count($this->tiles_array); $i++) { for ($i = 0; $i < count($this->tiles_array); $i++) {
$top = rand(-5, 5); $top = rand(-5, 5);
$left = rand(-5, 5); $left = rand(-5, 5);
@ -168,7 +168,7 @@ class TileStack extends TileBase {
} }
public function getOnClickAction() { public function getOnClickAction() {
return 'javascript:openNewGal(\''.htmlentities($this->stack_name).'\');'; return 'javascript:openNewGal(\''.$this->stack_name.'\');';
} }
private $tiles_array; private $tiles_array;

2
apps/tasks/templates/part.taskform.php
View File

@ -5,7 +5,7 @@
<input type="text" id="location" name="location" placeholder="<?php echo $l->t('Location of the task');?>" value="<?php echo isset($_['details']->LOCATION) ? $_['details']->LOCATION[0]->value : '' ?>"> <input type="text" id="location" name="location" placeholder="<?php echo $l->t('Location of the task');?>" value="<?php echo isset($_['details']->LOCATION) ? $_['details']->LOCATION[0]->value : '' ?>">
<br> <br>
<label for="categories"><?php echo $l->t('Categories'); ?></label> <label for="categories"><?php echo $l->t('Categories'); ?></label>
<input id="categories" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>"> <input id="categories" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
<a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a> <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
<br> <br>
<label for="due"><?php echo $l->t('Due'); ?></label> <label for="due"><?php echo $l->t('Due'); ?></label>

2
apps/user_ldap/settings.php
View File

@ -47,7 +47,7 @@ if ($_POST) {
// fill template // fill template
$tmpl = new OCP\Template( 'user_ldap', 'settings'); $tmpl = new OCP\Template( 'user_ldap', 'settings');
foreach($params as $param){ foreach($params as $param){
$value = htmlentities(OCP\Config::getAppValue('user_ldap', $param,'')); $value = OCP\Config::getAppValue('user_ldap', $param,'');
$tmpl->assign($param, $value); $tmpl->assign($param, $value);
} }

2
apps/user_openid/settings.php
View File

@ -2,7 +2,7 @@
$tmpl = new OCP\Template( 'user_openid', 'settings'); $tmpl = new OCP\Template( 'user_openid', 'settings');
$identity=OCP\Config::getUserValue(OCP\USER::getUser(),'user_openid','identity',''); $identity=OCP\Config::getUserValue(OCP\USER::getUser(),'user_openid','identity','');
$tmpl->assign('identity',htmlentities($identity)); $tmpl->assign('identity',$identity);
OCP\Util::addscript('user_openid','settings'); OCP\Util::addscript('user_openid','settings');

2
core/templates/404.php
View File

@ -10,6 +10,6 @@ if(!isset($_)){//also provide standalone error page
<ul> <ul>
<li class='error'> <li class='error'>
<?php echo $l->t( 'Cloud not found' ); ?><br/> <?php echo $l->t( 'Cloud not found' ); ?><br/>
<p class='hint'><?php if(isset($_['file'])) echo htmlentities($_['file'])?></p> <p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
</li> </li>
</ul> </ul>

2
core/templates/login.php
View File

@ -1,7 +1,7 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form action="index.php" method="post"> <form action="index.php" method="post">
<fieldset> <fieldset>
<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?> <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
<?php if($_['error']): ?> <?php if($_['error']): ?>
<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a> <a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
<?php endif; ?> <?php endif; ?>

49
lib/template.php
View File

@ -262,6 +262,7 @@ class OC_Template{
* @brief Assign variables * @brief Assign variables
* @param $key key * @param $key key
* @param $value value * @param $value value
* @param $sanitizeHTML false, if data shouldn't get passed through htmlentities
* @returns true * @returns true
* *
* This function assigns a variable. It can be accessed via $_[$key] in * This function assigns a variable. It can be accessed via $_[$key] in
@ -269,11 +270,29 @@ class OC_Template{
* *
* If the key existed before, it will be overwritten * If the key existed before, it will be overwritten
*/ */
public function assign( $key, $value ){ public function assign( $key, $value, $sanitizeHTML=true ){
if($sanitizeHTML == true) {
if(is_array($value)) {
array_walk_recursive($value,'OC_Template::sanitizeHTML');
} else {
$value = OC_Template::sanitizeHTML($value);
}
}
$this->vars[$key] = $value; $this->vars[$key] = $value;
return true; return true;
} }
/**
* @brief Internaly used to sanitze HTML
*
* This function is internally used to sanitize HTML.
*/
private static function sanitizeHTML( &$value ){
$value = htmlentities( $value );
return $value;
}
/** /**
* @brief Appends a variable * @brief Appends a variable
* @param $key key * @param $key key
@ -357,21 +376,21 @@ class OC_Template{
// Decide which page we show // Decide which page we show
if( $this->renderas == "user" ){ if( $this->renderas == "user" ){
$page = new OC_Template( "core", "layout.user" ); $page = new OC_Template( "core", "layout.user" );
$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' )); $page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
$page->assign('requesttoken', $this->vars['requesttoken']); $page->assign('requesttoken', $this->vars['requesttoken']);
if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){ if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
$page->assign('bodyid','body-settings'); $page->assign('bodyid','body-settings', false);
}else{ }else{
$page->assign('bodyid','body-user'); $page->assign('bodyid','body-user', false);
} }
// Add navigation entry // Add navigation entry
$navigation = OC_App::getNavigation(); $navigation = OC_App::getNavigation();
$page->assign( "navigation", $navigation); $page->assign( "navigation", $navigation, false);
$page->assign( "settingsnavigation", OC_App::getSettingsNavigation()); $page->assign( "settingsnavigation", OC_App::getSettingsNavigation(), false);
foreach($navigation as $entry) { foreach($navigation as $entry) {
if ($entry['active']) { if ($entry['active']) {
$page->assign( 'application', $entry['name'] ); $page->assign( 'application', $entry['name'], false );
break; break;
} }
} }
@ -385,7 +404,7 @@ class OC_Template{
// Read the detected formfactor and use the right file name. // Read the detected formfactor and use the right file name.
$fext = self::getFormFactorExtension(); $fext = self::getFormFactorExtension();
$page->assign('jsfiles', array()); $page->assign('jsfiles', array(), false);
// Add the core js files or the js files provided by the selected theme // Add the core js files or the js files provided by the selected theme
foreach(OC_Util::$scripts as $script){ foreach(OC_Util::$scripts as $script){
// Is it in 3rd party? // Is it in 3rd party?
@ -460,13 +479,13 @@ class OC_Template{
} }
// Add custom headers // Add custom headers
$page->assign('headers',$this->headers); $page->assign('headers',$this->headers, false);
foreach(OC_Util::$headers as $header){ foreach(OC_Util::$headers as $header){
$page->append('headers',$header); $page->append('headers',$header);
} }
// Add css files and js files // Add css files and js files
$page->assign( "content", $data ); $page->assign( "content", $data, false );
return $page->fetchPage(); return $page->fetchPage();
} }
else{ else{
@ -511,13 +530,13 @@ class OC_Template{
$_ = array_merge( $additionalparams, $this->vars ); $_ = array_merge( $additionalparams, $this->vars );
} }
// Einbinden // Include
ob_start(); ob_start();
include( $this->path.$file.'.php' ); include( $this->path.$file.'.php' );
$data = ob_get_contents(); $data = ob_get_contents();
@ob_end_clean(); @ob_end_clean();
// Daten zurückgeben // Return data
return $data; return $data;
} }
@ -531,7 +550,7 @@ class OC_Template{
public static function printUserPage( $application, $name, $parameters = array() ){ public static function printUserPage( $application, $name, $parameters = array() ){
$content = new OC_Template( $application, $name, "user" ); $content = new OC_Template( $application, $name, "user" );
foreach( $parameters as $key => $value ){ foreach( $parameters as $key => $value ){
$content->assign( $key, $value ); $content->assign( $key, $value, false );
} }
print $content->printPage(); print $content->printPage();
} }
@ -546,7 +565,7 @@ class OC_Template{
public static function printAdminPage( $application, $name, $parameters = array() ){ public static function printAdminPage( $application, $name, $parameters = array() ){
$content = new OC_Template( $application, $name, "admin" ); $content = new OC_Template( $application, $name, "admin" );
foreach( $parameters as $key => $value ){ foreach( $parameters as $key => $value ){
$content->assign( $key, $value ); $content->assign( $key, $value, false );
} }
return $content->printPage(); return $content->printPage();
} }
@ -561,7 +580,7 @@ class OC_Template{
public static function printGuestPage( $application, $name, $parameters = array() ){ public static function printGuestPage( $application, $name, $parameters = array() ){
$content = new OC_Template( $application, $name, "guest" ); $content = new OC_Template( $application, $name, "guest" );
foreach( $parameters as $key => $value ){ foreach( $parameters as $key => $value ){
$content->assign( $key, $value ); $content->assign( $key, $value,false );
} }
return $content->printPage(); return $content->printPage();
} }

2
settings/admin.php
View File

@ -23,7 +23,7 @@ function compareEntries($a,$b){
usort($entries, 'compareEntries'); usort($entries, 'compareEntries');
$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 )); $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries',$entries); $tmpl->assign('entries',$entries,false);
$tmpl->assign('forms',array()); $tmpl->assign('forms',array());
foreach($forms as $form){ foreach($forms as $form){
$tmpl->append('forms',$form); $tmpl->append('forms',$form);

2
settings/apps.php
View File

@ -92,7 +92,7 @@ usort($apps, 'app_sort');
$tmpl = new OC_Template( "settings", "apps", "user" ); $tmpl = new OC_Template( "settings", "apps", "user" );
$tmpl->assign('apps',$apps); $tmpl->assign('apps',$apps, false);
$tmpl->printPage(); $tmpl->printPage();

2
settings/templates/admin.php
View File

@ -29,7 +29,7 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
<?php echo $entry->app;?> <?php echo $entry->app;?>
</td> </td>
<td> <td>
<?php echo htmlentities($entry->message);?> <?php echo $entry->message;?>
</td> </td>
<td> <td>
<?php echo OC_Util::formatDate($entry->time);?> <?php echo OC_Util::formatDate($entry->time);?>

6
settings/templates/help.php
View File

@ -26,9 +26,9 @@
<?php foreach($_["kbe"] as $kb): ?> <?php foreach($_["kbe"] as $kb): ?>
<div class="helpblock"> <div class="helpblock">
<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?> <?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.htmlentities($kb["name"]).'</strong></a></p>');?> <?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
<p><?php echo htmlentities($kb['description']);?></p> <p><?php echo $kb['description'];?></p>
<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.htmlentities($kb['answer']).'</p>');?> <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
</div> </div>
<?php endforeach; <?php endforeach;
endif?> endif?>