t('Timezone');?>
t('Calendar CalDAV syncing address:');?>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 5f2bd6e9df..b491b3a90e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -387,10 +387,11 @@ Contacts={
$('#note').data('checksum', this.data.NOTE[0]['checksum']);
$('#note').find('textarea').val(this.data.NOTE[0]['value']);
$('#note').show();
+ $('#contacts_propertymenu a[data-type="NOTE"]').parent().hide();
} else {
$('#note').data('checksum', '');
$('#note').find('textarea').val('');
- //$('#note').hide();
+ $('#note').hide();
}
},
loadSingleProperties:function() {
@@ -536,7 +537,7 @@ Contacts={
},*/
editNew:function(){ // add a new contact
this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
- Contacts.UI.Card.add(';;;;', '', '', true);
+ Contacts.UI.Card.add(t('contacts', 'Contact')+';'+t('contacts', 'New')+';;;', t('contacts', 'New Contact'), '', true);
/*$.getJSON(OC.filePath('contacts', 'ajax', 'newcontact.php'),{},function(jsondata){
if(jsondata.status == 'success'){
id = '';
@@ -1403,6 +1404,14 @@ $(document).ready(function(){
Contacts.UI.Card.saveProperty(this);
});
+ $('#fn').blur(function(){
+ if($('#fn').val() == '') {
+ OC.dialogs.alert(t('contacts','The name field cannot be empty. Please enter a name for this contact.'), t('contacts','Name is empty'), function() { $('#fn').focus(); });
+ $('#fn').focus();
+ return false;
+ }
+ });
+
// Name has changed. Update it and reorder.
$('#fn').live('change',function(){
var name = $('#fn').val();
@@ -1429,19 +1438,19 @@ $(document).ready(function(){
$('#file_upload_start').live('change',function(){
Contacts.UI.Card.uploadPhoto(this.files);
});
- $('#contacts_details_photo').bind('dragover',function(event){
+ $('#contacts_details_photo_wrapper').bind('dragover',function(event){
console.log('dragover');
$(event.target).css('background-color','red');
event.stopPropagation();
event.preventDefault();
});
- $('#contacts_details_photo').bind('dragleave',function(event){
+ $('#contacts_details_photo_wrapper').bind('dragleave',function(event){
console.log('dragleave');
$(event.target).css('background-color','white');
//event.stopPropagation();
//event.preventDefault();
});
- $('#contacts_details_photo').bind('drop',function(event){
+ $('#contacts_details_photo_wrapper').bind('drop',function(event){
event.stopPropagation();
event.preventDefault();
console.log('drop');
diff --git a/apps/contacts/js/jquery.multi-autocomplete.js b/apps/contacts/js/jquery.multi-autocomplete.js
index e1c5d63dc5..5516a74b03 100644
--- a/apps/contacts/js/jquery.multi-autocomplete.js
+++ b/apps/contacts/js/jquery.multi-autocomplete.js
@@ -31,7 +31,9 @@
} else {
self.element.val(tmp);
}
- self.element.trigger('change'); // Changes wasn't saved when only using the dropdown.
+ if(self.element.val().trim() != '') {
+ self.element.trigger('change'); // Changes wasn't saved when only using the dropdown.
+ }
});
this.element.bind( "keydown", function( event ) {
if ( event.keyCode === $.ui.keyCode.TAB &&
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index b14a35e19e..256d10afc0 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -3,17 +3,23 @@
var categories = ;
var lang = '';
-
+
+
- t('Contacts'); ?> t('Contacts'); ?>
+ t('CardDAV syncing addresses'); ?> (t('more info'); ?> )
t('Primary address (Kontact et al)'); ?>
/
Media
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
index 9b5c3b6229..b940282b2c 100644
--- a/apps/remoteStorage/templates/settings.php
+++ b/apps/remoteStorage/templates/settings.php
@@ -1,6 +1,6 @@
'
+ echo ''.$l->t('remoteStorage').' user address: '
.OC_User::getUser().'@'.$_SERVER['SERVER_NAME']
.' (more info )';
diff --git a/apps/user_migrate/templates/admin.php b/apps/user_migrate/templates/admin.php
index b01e5c7579..ff51f43ffd 100644
--- a/apps/user_migrate/templates/admin.php
+++ b/apps/user_migrate/templates/admin.php
@@ -6,7 +6,7 @@
t('Import user account');?> t('ownCloud User Zip');?>
+
t('ownCloud User Zip');?>
diff --git a/config/config.sample.php b/config/config.sample.php
index 9f6d674fc0..8561d0a758 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -24,6 +24,10 @@ $CONFIG = array(
"mail_smtpauth" => "false",
"mail_smtpname" => "",
"mail_smtppassword" => "",
+"appcodechecker" => "",
+"log_type" => "",
+"logfile" => "",
+"loglevel" => "",
// "datadirectory" => ""
);
?>
diff --git a/core/css/styles.css b/core/css/styles.css
index 726427b47a..ccebc984fb 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -121,6 +121,8 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
#body-settings .personalblock#quota { position:relative; padding:0; }
#body-settings #controls+.helpblock { position:relative; margin-top: 3em; }
.personalblock > legend { margin-top:2em; }
+.personalblock > legend, th, dt, label { font-weight: bold; }
+code { font-family: "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
#quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
#quotatext {padding: .6em 1em;}
diff --git a/files/templates/admin.php b/files/templates/admin.php
index 9bcc40e936..01fe110526 100644
--- a/files/templates/admin.php
+++ b/files/templates/admin.php
@@ -7,9 +7,13 @@
t( 'Maximum upload size' ); ?> t( 'Enable ZIP-download' ); ?>
- t( 'Maximum input size for ZIP files:' ); ?>
+
+ t( 'Maximum input size for ZIP files' ); ?>
+
+
+
diff --git a/lib/installer.php b/lib/installer.php
index 6edf4ce1b7..d559227381 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -47,6 +47,7 @@ class OC_Installer{
* This function works as follows
* -# fetching the file
* -# unzipping it
+ * -# check the code
* -# installing the database at appinfo/database.xml
* -# including appinfo/install.php
* -# setting the installed version
@@ -91,6 +92,7 @@ class OC_Installer{
//extract the archive in a temporary folder
$extractDir=OC_Helper::tmpFolder();
+ OC_Helper::rmdirr($extractDir);
mkdir($extractDir);
if($archive=OC_Archive::open($path)){
$archive->extract($extractDir);
@@ -102,7 +104,7 @@ class OC_Installer{
}
return false;
}
-
+
//load the info.xml file of the app
if(!is_file($extractDir.'/appinfo/info.xml')){
//try to find it in a subdir
@@ -125,6 +127,12 @@ class OC_Installer{
}
$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true);
$basedir=OC::$APPSROOT.'/apps/'.$info['id'];
+
+ // check the code for not allowed calls
+ if(!OC_Installer::checkCode($info['id'],$extractDir)){
+ OC_Helper::rmdirr($extractDir);
+ return false;
+ }
//check if an app with the same id is already installed
if(self::isInstalled( $info['id'] )){
@@ -151,8 +159,8 @@ class OC_Installer{
}
//copy the app to the correct place
- if(!mkdir($basedir)){
- OC_Log::write('core','Can\'t create app folder ('.$basedir.')',OC_Log::ERROR);
+ if(@!mkdir($basedir)){
+ OC_Log::write('core','Can\'t create app folder. Please fix permissions. ('.$basedir.')',OC_Log::ERROR);
OC_Helper::rmdirr($extractDir);
if($data['source']=='http'){
unlink($path);
@@ -300,4 +308,49 @@ class OC_Installer{
OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));
return $info;
}
+
+
+ /**
+ * check the code of an app with some static code checks
+ * @param string $folder the folder of the app to check
+ * @returns true for app is o.k. and false for app is not o.k.
+ */
+ public static function checkCode($appname,$folder){
+
+ $blacklist=array(
+ 'fopen(',
+ 'eval('
+ // more evil pattern will go here later
+ // will will also check if an app is using private api once the public api is in place
+
+ );
+
+ // is the code checker enabled?
+ if(OC_Config::getValue('appcodechecker', false)){
+
+ // check if grep is installed
+ $grep = exec('which grep');
+ if($grep=='') {
+ OC_Log::write('core','grep not installed. So checking the code of the app "'.$appname.'" was not possible',OC_Log::ERROR);
+ return true;
+ }
+
+ // iterate the bad patterns
+ foreach($blacklist as $bl) {
+ $cmd = 'grep -ri '.escapeshellarg($bl).' '.$folder.'';
+ $result = exec($cmd);
+ // bad pattern found
+ if($result<>'') {
+ OC_Log::write('core','App "'.$appname.'" is using a not allowed call "'.$bl.'". Installation refused.',OC_Log::ERROR);
+ return false;
+ }
+ }
+ return true;
+
+ }else{
+ return true;
+ }
+ }
+
+
}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index df5791bd52..d460b33202 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -47,7 +47,7 @@
WebDAV
- t('use this address to connect to your ownCloud in your file manager');?>