First try of implementing assignHTML
This commit is contained in:
parent
0df67aeae9
commit
6817a6b102
|
@ -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->assignHTML('eventSources', $eventSources);
|
||||||
$tmpl->assign('categories', $categories);
|
$tmpl->assignHTML('categories', $categories);
|
||||||
if(array_key_exists('showevent', $_GET)){
|
if(array_key_exists('showevent', $_GET)){
|
||||||
$tmpl->assign('showevent', $_GET['showevent']);
|
$tmpl->assignHTML('showevent', $_GET['showevent']);
|
||||||
}
|
}
|
||||||
$tmpl->printPage();
|
$tmpl->printPage();
|
||||||
|
|
|
@ -14,7 +14,7 @@ $book = array(
|
||||||
'displayname' => '',
|
'displayname' => '',
|
||||||
);
|
);
|
||||||
$tmpl = new OCP\Template('contacts', 'part.editaddressbook');
|
$tmpl = new OCP\Template('contacts', 'part.editaddressbook');
|
||||||
$tmpl->assign('new', true);
|
$tmpl->assignHTML('new', true);
|
||||||
$tmpl->assign('addressbook', $book);
|
$tmpl->assignHTML('addressbook', $book);
|
||||||
$tmpl->printPage();
|
$tmpl->printPage();
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -33,7 +33,7 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
|
||||||
}
|
}
|
||||||
$addressbook = OC_Contacts_App::getAddressbook($bookid);
|
$addressbook = OC_Contacts_App::getAddressbook($bookid);
|
||||||
$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
|
$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
|
||||||
$tmpl->assign('addressbook', $addressbook);
|
$tmpl->assignHTML('addressbook', $addressbook);
|
||||||
OCP\JSON::success(array(
|
OCP\JSON::success(array(
|
||||||
'page' => $tmpl->fetchPage(),
|
'page' => $tmpl->fetchPage(),
|
||||||
'addressbook' => $addressbook,
|
'addressbook' => $addressbook,
|
||||||
|
|
|
@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
|
||||||
OCP\JSON::checkAppEnabled('contacts');
|
OCP\JSON::checkAppEnabled('contacts');
|
||||||
$addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
|
$addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
|
||||||
$tmpl = new OCP\Template("contacts", "part.editaddressbook");
|
$tmpl = new OCP\Template("contacts", "part.editaddressbook");
|
||||||
$tmpl->assign('new', false);
|
$tmpl->assignHTML('new', false);
|
||||||
$tmpl->assign('addressbook', $addressbook);
|
$tmpl->assignHTML('addressbook', $addressbook);
|
||||||
$tmpl->printPage();
|
$tmpl->printPage();
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -36,12 +36,12 @@ $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
|
||||||
$email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
|
$email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
|
||||||
|
|
||||||
$tmpl = new OCP\Template('contacts','part.contact');
|
$tmpl = new OCP\Template('contacts','part.contact');
|
||||||
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
|
$tmpl->assignHTML('uploadMaxFilesize', $maxUploadFilesize);
|
||||||
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
$tmpl->assignHTML('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
||||||
$tmpl->assign('adr_types',$adr_types);
|
$tmpl->assignHTML('adr_types',$adr_types);
|
||||||
$tmpl->assign('phone_types',$phone_types);
|
$tmpl->assignHTML('phone_types',$phone_types);
|
||||||
$tmpl->assign('email_types',$email_types);
|
$tmpl->assignHTML('email_types',$email_types);
|
||||||
$tmpl->assign('id','');
|
$tmpl->assignHTML('id','');
|
||||||
$page = $tmpl->fetchPage();
|
$page = $tmpl->fetchPage();
|
||||||
|
|
||||||
OCP\JSON::success(array('data' => array( 'page' => $page )));
|
OCP\JSON::success(array('data' => array( 'page' => $page )));
|
||||||
|
|
|
@ -59,16 +59,16 @@ OCP\Util::addStyle('contacts','jquery.Jcrop');
|
||||||
OCP\Util::addStyle('contacts','contacts');
|
OCP\Util::addStyle('contacts','contacts');
|
||||||
|
|
||||||
$tmpl = new OCP\Template( "contacts", "index", "user" );
|
$tmpl = new OCP\Template( "contacts", "index", "user" );
|
||||||
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
|
$tmpl->assignHTML('uploadMaxFilesize', $maxUploadFilesize);
|
||||||
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
$tmpl->assignHTML('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
||||||
$tmpl->assign('property_types', $property_types);
|
$tmpl->assignHTML('property_types', $property_types);
|
||||||
$tmpl->assign('phone_types', $phone_types);
|
$tmpl->assignHTML('phone_types', $phone_types);
|
||||||
$tmpl->assign('email_types', $email_types);
|
$tmpl->assignHTML('email_types', $email_types);
|
||||||
$tmpl->assign('categories', $categories);
|
$tmpl->assignHTML('categories', $categories);
|
||||||
$tmpl->assign('addressbooks', $addressbooks);
|
$tmpl->assignHTML('addressbooks', $addressbooks);
|
||||||
$tmpl->assign('contacts', $contacts);
|
$tmpl->assignHTML('contacts', $contacts);
|
||||||
$tmpl->assign('details', $details );
|
$tmpl->assignHTML('details', $details );
|
||||||
$tmpl->assign('id',$id);
|
$tmpl->assignHTML('id',$id);
|
||||||
$tmpl->printPage();
|
$tmpl->printPage();
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -5,8 +5,8 @@ $option_addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
|
||||||
for($i = 0; $i < count($option_addressbooks); $i++){
|
for($i = 0; $i < count($option_addressbooks); $i++){
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
|
$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
|
||||||
$tmpl->assign('addressbook', $option_addressbooks[$i]);
|
$tmpl->assignHTML('addressbook', $option_addressbooks[$i]);
|
||||||
$tmpl->assign('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
|
$tmpl->assignHTML('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
|
||||||
$tmpl->printpage();
|
$tmpl->printpage();
|
||||||
echo "</tr>";
|
echo "</tr>";
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,9 +54,9 @@ OCP\App::setActiveNavigationEntry( "files_administration" );
|
||||||
$htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
|
$htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
|
||||||
|
|
||||||
$tmpl = new OCP\Template( 'files', 'admin' );
|
$tmpl = new OCP\Template( 'files', 'admin' );
|
||||||
$tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable );
|
$tmpl->assignHTML( 'uploadChangable', $htaccessWorking and $htaccessWritable );
|
||||||
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
|
$tmpl->assignHTML( 'uploadMaxFilesize', $maxUploadFilesize);
|
||||||
$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
|
$tmpl->assignHTML( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
|
||||||
$tmpl->assign( 'allowZipDownload', $allowZipDownload);
|
$tmpl->assignHTML( 'allowZipDownload', $allowZipDownload);
|
||||||
$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
|
$tmpl->assignHTML( 'maxZipInputSize', $maxZipInputSize);
|
||||||
return $tmpl->fetchPage();
|
return $tmpl->fetchPage();
|
|
@ -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->assignHTML( 'files', $files );
|
||||||
$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
|
$list->assignHTML( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
|
||||||
$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
|
$list->assignHTML( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=');
|
||||||
$breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
|
$breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
|
||||||
$breadcrumbNav->assign( 'breadcrumb', $breadcrumb );
|
$breadcrumbNav->assignHTML( 'breadcrumb', $breadcrumb );
|
||||||
$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
|
$breadcrumbNav->assignHTML( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=');
|
||||||
|
|
||||||
$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,14 +89,14 @@ $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->assignHTML( 'fileList', $list->fetchPage() );
|
||||||
$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage() );
|
$tmpl->assignHTML( 'breadcrumb', $breadcrumbNav->fetchPage() );
|
||||||
$tmpl->assign( 'dir', $dir);
|
$tmpl->assignHTML( 'dir', $dir);
|
||||||
$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
|
$tmpl->assignHTML( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
|
||||||
$tmpl->assign( 'files', $files );
|
$tmpl->assignHTML( 'files', $files );
|
||||||
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
|
$tmpl->assignHTML( 'uploadMaxFilesize', $maxUploadFilesize);
|
||||||
$tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
$tmpl->assignHTML( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
||||||
$tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
|
$tmpl->assignHTML( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
|
||||||
$tmpl->printPage();
|
$tmpl->printPage();
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -186,7 +186,7 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
|
||||||
if(!$this->configured) {
|
if(!$this->configured) {
|
||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
if(empty($this->_groups)) {
|
if(is_null($this->_groups)) {
|
||||||
$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
|
$ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
|
||||||
$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
|
$this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,9 +156,11 @@ class OC_Template{
|
||||||
$this->application = $app;
|
$this->application = $app;
|
||||||
$this->vars = array();
|
$this->vars = array();
|
||||||
$this->l10n = OC_L10N::get($app);
|
$this->l10n = OC_L10N::get($app);
|
||||||
header('X-Frame-Options: Sameorigin');
|
|
||||||
header('X-XSS-Protection: 1; mode=block');
|
// Some security settings
|
||||||
header('X-Content-Type-Options: nosniff');
|
header('X-Frame-Options: Sameorigin');
|
||||||
|
header('X-XSS-Protection: 1; mode=block');
|
||||||
|
header('X-Content-Type-Options: nosniff');
|
||||||
|
|
||||||
$this->findTemplate($name);
|
$this->findTemplate($name);
|
||||||
}
|
}
|
||||||
|
@ -256,7 +258,7 @@ class OC_Template{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Assign variables
|
* @brief Assign variables and sanitizes the data
|
||||||
* @param $key key
|
* @param $key key
|
||||||
* @param $value value
|
* @param $value value
|
||||||
* @returns true
|
* @returns true
|
||||||
|
@ -267,6 +269,23 @@ 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 ){
|
||||||
|
$this->vars[$key] = htmlentities($value);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Assign variables
|
||||||
|
* @param $key key
|
||||||
|
* @param $value value
|
||||||
|
* @returns true
|
||||||
|
*
|
||||||
|
* This function assigns a variable. It can be accessed via $_[$key] in
|
||||||
|
* the template.
|
||||||
|
*
|
||||||
|
* If the key existed before, it will be overwritten
|
||||||
|
*/
|
||||||
|
public function assignHTML( $key, $value ){
|
||||||
$this->vars[$key] = $value;
|
$this->vars[$key] = $value;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -354,20 +373,20 @@ 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->assignHTML('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
|
||||||
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->assignHTML('bodyid','body-settings');
|
||||||
}else{
|
}else{
|
||||||
$page->assign('bodyid','body-user');
|
$page->assignHTML('bodyid','body-user');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add navigation entry
|
// Add navigation entry
|
||||||
$navigation = OC_App::getNavigation();
|
$navigation = OC_App::getNavigation();
|
||||||
$page->assign( "navigation", $navigation);
|
$page->assignHTML( "navigation", $navigation);
|
||||||
$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
|
$page->assignHTML( "settingsnavigation", OC_App::getSettingsNavigation());
|
||||||
foreach($navigation as $entry) {
|
foreach($navigation as $entry) {
|
||||||
if ($entry['active']) {
|
if ($entry['active']) {
|
||||||
$page->assign( 'application', $entry['name'] );
|
$page->assignHTML( 'application', $entry['name'] );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -381,7 +400,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->assignHTML('jsfiles', array());
|
||||||
// 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?
|
||||||
|
@ -418,7 +437,7 @@ class OC_Template{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Add the css files
|
// Add the css files
|
||||||
$page->assign('cssfiles', array());
|
$page->assignHTML('cssfiles', array());
|
||||||
foreach(OC_Util::$styles as $style){
|
foreach(OC_Util::$styles as $style){
|
||||||
// is it in 3rdparty?
|
// is it in 3rdparty?
|
||||||
if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
|
if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
|
||||||
|
@ -456,13 +475,13 @@ class OC_Template{
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add custom headers
|
// Add custom headers
|
||||||
$page->assign('headers',$this->headers);
|
$page->assignHTML('headers',$this->headers);
|
||||||
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->assignHTML( "content", $data );
|
||||||
return $page->fetchPage();
|
return $page->fetchPage();
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
|
Loading…
Reference in New Issue