Merge branch 'master' into dev

huridocs · Oct 13, 2016 · 29d7cd4 · 29d7cd4
2 parents 4ac2524 + 13d5863
commit 29d7cd4
Show file tree

Hide file tree

Showing 72 changed files with 8,867 additions and 2,805 deletions.
diff --git a/3rd/adodb5/adodb-active-record.inc.php b/3rd/adodb5/adodb-active-record.inc.php
diff --git a/conf/conf_meta.php b/conf/conf_meta.php
@@ -11,5 +11,36 @@
     "recaptcha_private_key"=>_t("reCAPTCHA Private Key"));
 
 $alt_conf_check=array("acl_base"=>"t","debug"=>"t","enable_cache"=>"t","custom_form"=>"t",
-"related_search"=>"t","use_recaptcha"=>"t");
+    "related_search"=>"t","use_recaptcha"=>"t");
 
+
+$alt_conf['hide_person_format'] = _t('Hide Person Format');
+$alt_conf['hide_event_format'] = _t('Hide Event Format');
+$alt_conf['hide_act_format'] = _t('Hide Act Format');
+$alt_conf['hide_supporting_docs_meta_format'] = _t('Hide Document Format');
+$alt_conf['hide_arrest_format'] = _t('Hide Arrest Format');
+$alt_conf['hide_destruction_format'] = _t('Hide Destruction Format');
+$alt_conf['hide_killing_format'] = _t('Hide Killing Format');
+$alt_conf['hide_torture_format'] = _t('Hide Tortur Format');
+$alt_conf['hide_chain_of_events_format'] = _t('Hide Chain of Events Format');
+$alt_conf['hide_involvement_format'] = _t('Hide Involvement Format');
+$alt_conf['hide_information_format'] = _t('Hide Information Format');
+$alt_conf['hide_intervention_format'] = _t('Hide Intervention Format');
+$alt_conf['hide_biographic_details_format'] = _t('Hide Biographic Details Format');
+$alt_conf['hide_address_format'] = _t('Hide Address Format');
+
+
+$alt_conf_check['hide_person_format'] = "t";
+$alt_conf_check['hide_event_format'] = "t";
+$alt_conf_check['hide_act_format'] = "t";
+$alt_conf_check['hide_supporting_docs_meta_format'] = "t";
+$alt_conf_check['hide_arrest_format'] = "t";
+$alt_conf_check['hide_destruction_format'] = "t";
+$alt_conf_check['hide_killing_format'] = "t";
+$alt_conf_check['hide_torture_format'] = "t";
+$alt_conf_check['hide_chain_of_events_format'] = "t";
+$alt_conf_check['hide_involvement_format'] = "t";
+$alt_conf_check['hide_information_format'] = "t";
+$alt_conf_check['hide_intervention_format'] = "t";
+$alt_conf_check['hide_biographic_details_format'] = "t";
+$alt_conf_check['hide_address_format'] = "t";
diff --git a/data/DomainEntity.php b/data/DomainEntity.php
@@ -88,23 +88,24 @@ public function getEntityType() {
     public function SaveAll() {
 
         $saveType = $this->getSaveType();
-
-        acl_is_entity_allowed($this->entity, $saveType, $this->{$this->keyName});
+        acl_is_entity_allowed($this->entity, $saveType, $this->{$this->keyName});    
 
         $this->Save();
+
         $this->SaveManagementData();
 
         foreach ($this->mt as $mtField) {
             if (sizeof($this->$mtField) > 0) {
-
                 MtFieldWrapper::setMTTermsforEntity($mtField, $this->entity, $this->{$this->keyName}, $this->$mtField);
             }
         }
+
         foreach ($this->uf as $userField) {
             if (sizeof($this->$userField) > 0) {
                 UserFieldWrapper::setUserTermsforEntity($userField, $this->entity, $this->{$this->keyName}, $this->$userField);
             }
         }
+
         $this->saveClarifyingNotes();
         $this->SaveDocs();
         $this->SaveGeometries();
@@ -116,11 +117,10 @@ public function LoadfromRecordNumber($record_number) {
         global $global;
         if ($record_number != null) {
             acl_is_entity_allowed($this->entity, 'read', $record_number);
-            $record_number = $global['db']->qstr($record_number);
-            $this->Load("$this->keyName=$record_number");
-            $this->LoadManagementData();
         }
-        //var_dump($this);
+        $record_number = $global['db']->qstr($record_number);
+        $this->Load("$this->keyName=$record_number");
+        $this->LoadManagementData();
     }
 
     public function LoadRelationships() {

diff --git a/data/MtFieldWrapper.php b/data/MtFieldWrapper.php
@@ -29,24 +29,7 @@
  *
  */
 
-class MtFieldWrapper {//extends MtField{
-
-
-
-
-/*    public function __construct($entity_name,  $field_name){
-        parent::__construct('mlt_' . $entity_name . '_' . $field_name); 
-
-
-        $this->entity_name = trim($entity_name);
-        $this->field_name = trim($field_name);
-        $this->Table_name = 'mlt_' . $this->entity_name . '_' . $this->field_name ;
-        //$mtField = new MtField($this->table_name);        
-        //$this->mtField = $mtField;
-        //return $mtField;        
-        var_dump($this);
-    }*/
-
+class MtFieldWrapper {
 
 
     public static function getObject($entity_name,  $field_name){
@@ -76,7 +59,6 @@ public static function setMTTermsforEntity($fieldName, $entityName , $entityID ,
         }
     }
 
-
     public static function getMTList($fieldName){
         $mt_terms = new MtTerms();
         $mt_values = $mt_terms->getAllHuriTerms($fieldName);

diff --git a/inc/i18n/handler_l10n.inc b/inc/i18n/handler_l10n.inc
@@ -37,5 +37,9 @@ function _t($string)
 	/*
 	 * standard translation
 	 */
-    return T_($string);
+    $translation =  T_($string);
+    if(isset($conf['string-replace-list'])){
+        return str_replace ( array_keys($conf['string-replace-list']) , array_values($conf['string-replace-list']) ,$translation);
+    }
+    return $translation;
 }