Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
modules/Meetings/views/view.edit.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -44,45 +44,45 @@
 block discarded – undo
44 44
 
45 45
 class MeetingsViewEdit extends ViewEdit
46 46
 {
47
- 	/**
48
- 	 * @see SugarView::preDisplay()
49
- 	 *
50
- 	 * Override preDisplay to check for presence of 'status' in $_REQUEST
51
- 	 * This is to support the "Close And Create New" operation.
52
- 	 */
53
- 	public function preDisplay()
54
- 	{
55
- 		if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
56
-	       $this->bean->status = 'Held';
57
- 		}
47
+        /**
48
+         * @see SugarView::preDisplay()
49
+         *
50
+         * Override preDisplay to check for presence of 'status' in $_REQUEST
51
+         * This is to support the "Close And Create New" operation.
52
+         */
53
+        public function preDisplay()
54
+        {
55
+            if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
56
+            $this->bean->status = 'Held';
57
+            }
58 58
 
59
- 		parent::preDisplay();
60
- 	}
59
+            parent::preDisplay();
60
+        }
61 61
 
62
- 	/**
63
- 	 * @see SugarView::display()
64
- 	 */
65
- 	public function display()
66
- 	{
67
- 		global $json;
62
+        /**
63
+         * @see SugarView::display()
64
+         */
65
+        public function display()
66
+        {
67
+            global $json;
68 68
         $json = getJSONobj();
69 69
         $json_config = new json_config();
70
-		if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
71
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
72
-		} else {
73
-			$this->bean->json_id = $this->bean->id;
74
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
75
-		}
76
- 		$this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
77
- 		if($this->ev->isDuplicate){
78
-	        $this->bean->status = $this->bean->getDefaultStatus();
79
- 		} //if
70
+        if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
71
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
72
+        } else {
73
+            $this->bean->json_id = $this->bean->id;
74
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
75
+        }
76
+            $this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
77
+            if($this->ev->isDuplicate){
78
+            $this->bean->status = $this->bean->getDefaultStatus();
79
+            } //if
80 80
 
81
-		$this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
82
-		$this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
83
-		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
84
-		$this->ss->assign('remindersDisabled', json_encode(false));
81
+        $this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
82
+        $this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
83
+        $this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
84
+        $this->ss->assign('remindersDisabled', json_encode(false));
85 85
 
86
- 		parent::display();
87
- 	}
86
+            parent::display();
87
+        }
88 88
 }
Please login to merge, or discard this patch.
modules/ModuleBuilder/action_view_map.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -43,28 +43,28 @@
 block discarded – undo
43 43
  * To change the template for this generated file go to
44 44
  * Window - Preferences - PHPeclipse - PHP - Code Templates
45 45
  */
46
- //format '<action_name>' => '<view_name>',
47
- $action_view_map = array(
48
- 						'index' => 'main',
49
- 						'module'=>'module',
50
- 						'modulefields'=>'modulefields',
51
- 						'modulelabels'=>'modulelabels',
52
- 						'relationships'=>'relationships',
53
- 						'relationship'=>'relationship',
46
+    //format '<action_name>' => '<view_name>',
47
+    $action_view_map = array(
48
+                            'index' => 'main',
49
+                            'module'=>'module',
50
+                            'modulefields'=>'modulefields',
51
+                            'modulelabels'=>'modulelabels',
52
+                            'relationships'=>'relationships',
53
+                            'relationship'=>'relationship',
54 54
                         'resetmodule'=>'resetmodule',
55
- 						'modulefield'=>'modulefield',
56
- 						'displaydeploy'=>'displaydeploy',
57
- 						'package'=>'package',
58
- 						'dropdown'=>'dropdown',
59
- 						'dropdowns'=>'dropdowns',
60
- 						'detailview' => 'detail',
61
- 						'editview' => 'edit',
62
- 						'popup' => 'popup',
63
- 						'home'=>'home',
55
+                            'modulefield'=>'modulefield',
56
+                            'displaydeploy'=>'displaydeploy',
57
+                            'package'=>'package',
58
+                            'dropdown'=>'dropdown',
59
+                            'dropdowns'=>'dropdowns',
60
+                            'detailview' => 'detail',
61
+                            'editview' => 'edit',
62
+                            'popup' => 'popup',
63
+                            'home'=>'home',
64 64
                         'visibilityeditor' => 'visibilityeditor',
65
- 						'exportcustomizations'=>'exportcustomizations',
65
+                            'exportcustomizations'=>'exportcustomizations',
66 66
 
67
- 					);
67
+                        );
68 68
     // add those we need from the global action_view_map
69 69
     $action_view_map['dc'] = 'dc';
70 70
     $action_view_map['dcajax'] = 'dcajax';
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.module.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -41,36 +41,36 @@  discard block
 block discarded – undo
41 41
 
42 42
 class ViewModule extends SugarView
43 43
 {
44
-	var $mbModule;
44
+    var $mbModule;
45 45
 	
46
- 	/**
47
-	 * @see SugarView::_getModuleTitleParams()
48
-	 */
49
-	protected function _getModuleTitleParams($browserTitle = false)
50
-	{
51
-	    global $mod_strings;
46
+        /**
47
+         * @see SugarView::_getModuleTitleParams()
48
+         */
49
+    protected function _getModuleTitleParams($browserTitle = false)
50
+    {
51
+        global $mod_strings;
52 52
 	    
53
-    	return array(
54
-    	   translate('LBL_MODULE_NAME','Administration'),
55
-    	   ModuleBuilderController::getModuleTitle(),
56
-    	   );
53
+        return array(
54
+            translate('LBL_MODULE_NAME','Administration'),
55
+            ModuleBuilderController::getModuleTitle(),
56
+            );
57 57
     }
58 58
 
59
-	function display()
60
-	{
61
-		global $mod_strings;
62
- 		$smarty = new Sugar_Smarty();
59
+    function display()
60
+    {
61
+        global $mod_strings;
62
+            $smarty = new Sugar_Smarty();
63 63
 
64
-		require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
65
-		$mb = new ModuleBuilder();
66
-		$mb->getPackage($_REQUEST['view_package']);
67
-		$package = $mb->packages[$_REQUEST['view_package']];
68
-		$module_name = (!empty($_REQUEST['view_module']))?$_REQUEST['view_module']:'';
69
-		$package->getModule($module_name);
70
-		$this->mbModule = $package->modules[$module_name];
71
-		$this->loadPackageHelp($module_name);
64
+        require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
65
+        $mb = new ModuleBuilder();
66
+        $mb->getPackage($_REQUEST['view_package']);
67
+        $package = $mb->packages[$_REQUEST['view_package']];
68
+        $module_name = (!empty($_REQUEST['view_module']))?$_REQUEST['view_module']:'';
69
+        $package->getModule($module_name);
70
+        $this->mbModule = $package->modules[$module_name];
71
+        $this->loadPackageHelp($module_name);
72 72
 		
73
-		// set up the list of either available types for a new module, or implemented types for an existing one
73
+        // set up the list of either available types for a new module, or implemented types for an existing one
74 74
         $types = (empty($module_name)) ? MBModule::getTypes() : $this->mbModule->mbvardefs->templates ;
75 75
         
76 76
         foreach( $types as $type=>$definition)
@@ -80,28 +80,28 @@  discard block
 block discarded – undo
80 80
         natcasesort($translated_type);
81 81
         $smarty->assign('types',$translated_type);
82 82
 		
83
-		$smarty->assign('package', $package);
84
-		$smarty->assign('module', $this->mbModule);
85
-		$smarty->assign('mod_strings', $mod_strings);
83
+        $smarty->assign('package', $package);
84
+        $smarty->assign('module', $this->mbModule);
85
+        $smarty->assign('mod_strings', $mod_strings);
86 86
 
87
-		$ajax = new AjaxCompose();
88
-		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
89
-		$ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
90
-		if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
91
-		$ajax->addCrumb($module_name, '');
92
-		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
93
-		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
94
-			$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
95
-		$ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
87
+        $ajax = new AjaxCompose();
88
+        $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
89
+        $ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
90
+        if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
91
+        $ajax->addCrumb($module_name, '');
92
+        $html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
93
+        if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
94
+            $html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
95
+        $ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
96 96
 		
97
-		echo $ajax->getJavascript();
98
- 	}
97
+        echo $ajax->getJavascript();
98
+        }
99 99
  	
100
- 	function loadPackageHelp(
101
- 	    $name
102
- 	    )
103
- 	{
100
+        function loadPackageHelp(
101
+            $name
102
+            )
103
+        {
104 104
         $this->mbModule->help['default'] = (empty($name))?'create':'modify';
105 105
         $this->mbModule->help['group'] = 'module';
106
- 	}
106
+        }
107 107
 }
108 108
\ No newline at end of file
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.searchview.php 1 patch
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -48,88 +48,88 @@
 block discarded – undo
48 48
 
49 49
 class ViewSearchView extends ViewListView
50 50
 {
51
- 	function __construct()
52
- 	{
53
- 		parent::__construct();
54
- 		if (!empty($_REQUEST['searchlayout'])) {
55
- 			$this->editLayout = $_REQUEST['searchlayout'];
56
- 		}
57
- 	}
51
+        function __construct()
52
+        {
53
+            parent::__construct();
54
+            if (!empty($_REQUEST['searchlayout'])) {
55
+                $this->editLayout = $_REQUEST['searchlayout'];
56
+            }
57
+        }
58 58
  	
59
- 	/**
60
-	 * @see SugarView::_getModuleTitleParams()
61
-	 */
62
-	protected function _getModuleTitleParams($browserTitle = false)
63
-	{
64
-	    global $mod_strings;
59
+        /**
60
+         * @see SugarView::_getModuleTitleParams()
61
+         */
62
+    protected function _getModuleTitleParams($browserTitle = false)
63
+    {
64
+        global $mod_strings;
65 65
 	    
66
-    	return array(
67
-    	   translate('LBL_MODULE_NAME','Administration'),
68
-    	   ModuleBuilderController::getModuleTitle(),
69
-    	   );
66
+        return array(
67
+            translate('LBL_MODULE_NAME','Administration'),
68
+            ModuleBuilderController::getModuleTitle(),
69
+            );
70 70
     }
71 71
 
72
- 	// DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
73
- 	function preDisplay()
74
- 	{
75
- 	}
72
+        // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
73
+        function preDisplay()
74
+        {
75
+        }
76 76
 
77
- 	function display(
78
- 	    $preview = false
79
- 	    )
80
- 	{
81
- 		$packageName = (isset ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : '' ;
82
- 		require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
83
- 		$parser = ParserFactory::getParser ( $this->editLayout , $this->editModule, $packageName ) ;
77
+        function display(
78
+            $preview = false
79
+            )
80
+        {
81
+            $packageName = (isset ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : '' ;
82
+            require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
83
+            $parser = ParserFactory::getParser ( $this->editLayout , $this->editModule, $packageName ) ;
84 84
 
85
- 		$smarty = parent::constructSmarty ( $parser ) ;
86
- 		$smarty->assign ( 'action', 'searchViewSave' ) ;
87
- 		$smarty->assign ( 'view', $this->editLayout ) ;
88
- 		$smarty->assign ( 'helpName', 'searchViewEditor' ) ;
89
- 		$smarty->assign ( 'helpDefault', 'modify' ) ;
85
+            $smarty = parent::constructSmarty ( $parser ) ;
86
+            $smarty->assign ( 'action', 'searchViewSave' ) ;
87
+            $smarty->assign ( 'view', $this->editLayout ) ;
88
+            $smarty->assign ( 'helpName', 'searchViewEditor' ) ;
89
+            $smarty->assign ( 'helpDefault', 'modify' ) ;
90 90
 
91
- 		if ($preview)
92
- 		{
93
- 			echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
94
- 		} else
95
- 		{
96
- 			$ajax = $this->constructAjax () ;
97
- 			$ajax->addSection ( 'center', translate ($this->title), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
98
- 			echo $ajax->getJavascript () ;
99
- 		}
100
- 	}
91
+            if ($preview)
92
+            {
93
+                echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
94
+            } else
95
+            {
96
+                $ajax = $this->constructAjax () ;
97
+                $ajax->addSection ( 'center', translate ($this->title), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
98
+                echo $ajax->getJavascript () ;
99
+            }
100
+        }
101 101
 
102
- 	function constructAjax()
103
- 	{
104
- 		require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
105
- 		$ajax = new AjaxCompose ( ) ;
106
- 		switch ( $this->editLayout )
107
- 		{
108
- 			default:
109
- 				$searchLabel = 'LBL_' . strtoupper ( $this->editLayout) ;
110
- 		}
102
+        function constructAjax()
103
+        {
104
+            require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
105
+            $ajax = new AjaxCompose ( ) ;
106
+            switch ( $this->editLayout )
107
+            {
108
+                default:
109
+                 $searchLabel = 'LBL_' . strtoupper ( $this->editLayout) ;
110
+            }
111 111
 
112 112
         $layoutLabel = 'LBL_LAYOUTS' ;
113 113
         $layoutView = 'layouts' ;
114 114
 
115 115
 
116
- 		if ($this->fromModuleBuilder)
117
- 		{
118
- 			$ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
119
- 			$ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
120
- 			$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
121
- 			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
122
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
123
- 			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
124
- 		} else
125
- 		{
126
- 			$ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
127
- 			$ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
128
- 			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
129
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
130
- 			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
131
- 		}
132
- 		$this->title = $searchLabel;
133
- 		return $ajax ;
134
- 	}
116
+            if ($this->fromModuleBuilder)
117
+            {
118
+                $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
119
+                $ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
120
+                $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
121
+                $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
122
+                if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
123
+                $ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
124
+            } else
125
+            {
126
+                $ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
127
+                $ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
128
+                $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
129
+                if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
130
+                $ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
131
+            }
132
+            $this->title = $searchLabel;
133
+            return $ajax ;
134
+        }
135 135
 }
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.exportcustomizations.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -40,40 +40,40 @@
 block discarded – undo
40 40
 require_once('modules/ModuleBuilder/MB/AjaxCompose.php');
41 41
 class ViewExportcustomizations extends SugarView
42 42
 {
43
-	/**
44
-	 * @see SugarView::_getModuleTitleParams()
45
-	 */
46
-	protected function _getModuleTitleParams($browserTitle = false)
47
-	{
48
-	    global $mod_strings;
43
+    /**
44
+     * @see SugarView::_getModuleTitleParams()
45
+     */
46
+    protected function _getModuleTitleParams($browserTitle = false)
47
+    {
48
+        global $mod_strings;
49 49
 	    
50
-    	return array(
51
-    	   translate('LBL_MODULE_NAME','Administration'),
52
-    	   ModuleBuilderController::getModuleTitle(),
53
-    	   );
50
+        return array(
51
+            translate('LBL_MODULE_NAME','Administration'),
52
+            ModuleBuilderController::getModuleTitle(),
53
+            );
54 54
     }
55 55
 
56
-	function display()
57
-	{
58
- 		global $current_user, $mod_strings;
59
- 		$smarty = new Sugar_Smarty();
60
- 		$mb = new MBPackage("packageCustom");
61
- 		$mod=$mb->getCustomModules();
62
- 		foreach($mod as $key => $value){
63
- 		    $modules[]=$key;
64
- 		    $custom[]=$value;
65
- 		}
66
- 		$nb_mod = count($modules);
67
- 		$smarty->assign('mod_strings', $mod_strings);
68
- 		$smarty->assign('modules', $mod);
69
- 		$smarty->assign('custom', $custom);
70
- 		$smarty->assign('nb_mod', $nb_mod);
71
- 		$smarty->assign('defaultHelp', 'exportHelp');
72
- 		$smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
73
- 		$smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
74
-		$ajax = new AjaxCompose();
75
-		$ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
76
-		$ajax->addSection('center', $mod_strings['LBL_EC_TITLE'],$smarty->fetch($this->getCustomFilePathIfExists('modules/ModuleBuilder/tpls/exportcustomizations.tpl')));
77
-		echo $ajax->getJavascript();
78
- 	}
56
+    function display()
57
+    {
58
+            global $current_user, $mod_strings;
59
+            $smarty = new Sugar_Smarty();
60
+            $mb = new MBPackage("packageCustom");
61
+            $mod=$mb->getCustomModules();
62
+            foreach($mod as $key => $value){
63
+                $modules[]=$key;
64
+                $custom[]=$value;
65
+            }
66
+            $nb_mod = count($modules);
67
+            $smarty->assign('mod_strings', $mod_strings);
68
+            $smarty->assign('modules', $mod);
69
+            $smarty->assign('custom', $custom);
70
+            $smarty->assign('nb_mod', $nb_mod);
71
+            $smarty->assign('defaultHelp', 'exportHelp');
72
+            $smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
73
+            $smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
74
+        $ajax = new AjaxCompose();
75
+        $ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
76
+        $ajax->addSection('center', $mod_strings['LBL_EC_TITLE'],$smarty->fetch($this->getCustomFilePathIfExists('modules/ModuleBuilder/tpls/exportcustomizations.tpl')));
77
+        echo $ajax->getJavascript();
78
+        }
79 79
 }
80 80
\ No newline at end of file
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.relationship.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 class ViewRelationship extends SugarView
48 48
 {
49 49
     /**
50
-	 * @see SugarView::_getModuleTitleParams()
51
-	 */
52
-	protected function _getModuleTitleParams($browserTitle = false)
53
-	{
54
-	    global $mod_strings;
50
+     * @see SugarView::_getModuleTitleParams()
51
+     */
52
+    protected function _getModuleTitleParams($browserTitle = false)
53
+    {
54
+        global $mod_strings;
55 55
 	    
56
-    	return array(
57
-    	   translate('LBL_MODULE_NAME','Administration'),
58
-    	   ModuleBuilderController::getModuleTitle(),
59
-    	   );
56
+        return array(
57
+            translate('LBL_MODULE_NAME','Administration'),
58
+            ModuleBuilderController::getModuleTitle(),
59
+            );
60 60
     }
61 61
 
62 62
     function overrideDefinitionFromPOST(
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
         require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
67 67
         foreach ( AbstractRelationship::$definitionKeys as $key )
68 68
         {
69
-        	if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
70
-        		continue;
71
-        	}
69
+            if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
70
+                continue;
71
+            }
72 72
             if (! empty ( $_REQUEST [ $key ] ))
73 73
             {
74 74
                 $definition [ $key ] = $_REQUEST [ $key ] ;
@@ -92,15 +92,15 @@  discard block
 block discarded – undo
92 92
             $fields = $module->fields ;
93 93
             require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
94 94
             $relatableModules = DeployedRelationships::findRelatableModules () ;
95
-        	$appStrings = return_app_list_strings_language( $selected_lang ) ;
96
-        	$modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
97
-        	$appStrings = $appStrings['moduleList'];
95
+            $appStrings = return_app_list_strings_language( $selected_lang ) ;
96
+            $modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
97
+            $appStrings = $appStrings['moduleList'];
98 98
         } else
99 99
         {
100 100
             $mb = new ModuleBuilder ( ) ;
101
-			$mb->getPackages();
102
-			//display the latest module name rather than what is in or not in the loaded app_list_strings.
103
-			$mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
101
+            $mb->getPackages();
102
+            //display the latest module name rather than what is in or not in the loaded app_list_strings.
103
+            $mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
104 104
             $module = $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
105 105
             $moduleName = empty($module->key_name) ? $module->getModuleName() : $module->key_name;
106 106
             $this->smarty->assign ( 'view_package', $_REQUEST [ 'view_package' ] ) ;
@@ -132,16 +132,16 @@  discard block
 block discarded – undo
132 132
             $relationship->setName($_REQUEST [ 'relationship_name' ] );
133 133
             $definition = $relationship->getDefinition();
134 134
             if (!$this->fromModuleBuilder){
135
-        		$modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
136
-	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
137
-	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
138
-	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
139
-			}else{
140
-				#30624
141
-				if(!empty($_REQUEST['rhs_module'])){
142
-					$definition['rhs_label'] = $_REQUEST['rhs_module'];
143
-				}
144
-			}
135
+                $modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
136
+                $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
137
+                $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
138
+                $definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
139
+            }else{
140
+                #30624
141
+                if(!empty($_REQUEST['rhs_module'])){
142
+                    $definition['rhs_label'] = $_REQUEST['rhs_module'];
143
+                }
144
+            }
145 145
         } else
146 146
         {
147 147
             $definition = array ( ) ;
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         
157 157
         if (empty($definition ['rhs_label']))
158 158
         {
159
-        	$definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
159
+            $definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
160 160
         }
161 161
         if (empty($definition ['lhs_label']))
162 162
         {
@@ -185,17 +185,17 @@  discard block
 block discarded – undo
185 185
             }
186 186
 
187 187
             if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Activities') {
188
-            	$cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
188
+                $cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
189 189
             }
190 190
             //Bug 23139, Campaigns module current cannot display custom subpanels, so we need to ban it from any
191 191
             //relationships that would require a new subpanel to be shown in Campaigns.
192
-        	if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
193
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
194
-            	unset ( $cardinality [ MB_ONETOMANY ] ) ;
192
+            if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
193
+                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
194
+                unset ( $cardinality [ MB_ONETOMANY ] ) ;
195 195
             }
196
-        	if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
197
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
198
-            	unset ( $cardinality [ MB_MANYTOONE ] );
196
+            if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
197
+                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
198
+                unset ( $cardinality [ MB_MANYTOONE ] );
199 199
             }
200 200
             if (! isset($cardinality[$relationship->getType()]))
201 201
             {
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
206 206
             
207 207
             $this->smarty->assign ( 'is_new', true ) ;
208 208
         } else {
209
-        	$this->smarty->assign ( 'is_new', false ) ;
209
+            $this->smarty->assign ( 'is_new', false ) ;
210 210
         }
211 211
         
212 212
         //Remove Activities if one-to-many is not availible
213
-    	if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
214
-        	unset ($relatableModules['Activities']);
213
+        if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
214
+            unset ($relatableModules['Activities']);
215 215
         }
216 216
         
217 217
         
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
         $this->smarty->assign ( 'rhspanels', $rhs_subpanels ) ;
238 238
         $this->smarty->assign ( 'lhspanels', $lhs_subpanels ) ;
239 239
         $this->smarty->assign('selected_lang', $selected_lang);
240
-		$this->smarty->assign('available_languages',get_languages());
240
+        $this->smarty->assign('available_languages',get_languages());
241 241
         
242 242
         switch ( $relationship->relationship_type)
243 243
         {
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.dropdowns.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -41,31 +41,31 @@  discard block
 block discarded – undo
41 41
 
42 42
 class ViewDropdowns extends SugarView
43 43
 {
44
- 	/**
45
-	 * @see SugarView::_getModuleTitleParams()
46
-	 */
47
-	protected function _getModuleTitleParams($browserTitle = false)
48
-	{
49
-	    global $mod_strings;
44
+        /**
45
+         * @see SugarView::_getModuleTitleParams()
46
+         */
47
+    protected function _getModuleTitleParams($browserTitle = false)
48
+    {
49
+        global $mod_strings;
50 50
 	    
51
-    	return array(
52
-    	   translate('LBL_MODULE_NAME','Administration'),
53
-    	   ModuleBuilderController::getModuleTitle(),
54
-    	   );
51
+        return array(
52
+            translate('LBL_MODULE_NAME','Administration'),
53
+            ModuleBuilderController::getModuleTitle(),
54
+            );
55 55
     }
56 56
 
57
-	function display()
58
- 	{
59
-		$ajax = new AjaxCompose();
60
-		$smarty = new Sugar_Smarty();
57
+    function display()
58
+        {
59
+        $ajax = new AjaxCompose();
60
+        $smarty = new Sugar_Smarty();
61 61
 		
62
- 		if (isset($_REQUEST['refreshTree']))
63
-		{
64
-			require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
65
-			$mbt = new DropDownTree();
66
-			$ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
67
-			$smarty->assign('refreshTree',true);
68
-		}
62
+            if (isset($_REQUEST['refreshTree']))
63
+        {
64
+            require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
65
+            $mbt = new DropDownTree();
66
+            $ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
67
+            $smarty->assign('refreshTree',true);
68
+        }
69 69
                 
70 70
         global $mod_strings;
71 71
         $ajax->addCrumb($mod_strings['LBL_DROPDOWNEDITOR'], 'ModuleBuilder.main("dropdowns")');
@@ -75,12 +75,12 @@  discard block
 block discarded – undo
75 75
         
76 76
         $smarty->assign('LBL_BTN_ADDDROPDOWN',translate('LBL_BTN_ADDDROPDOWN'));
77 77
         $smarty->assign('dropdowns', $dd->getNodes());
78
-		$smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
79
-		$smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
80
-		$smarty->assign('action', 'savedropdown');
78
+        $smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
79
+        $smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
80
+        $smarty->assign('action', 'savedropdown');
81 81
 		
82 82
 
83
-		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
84
- 		echo $ajax->getJavascript();
85
- 	}
83
+        $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
84
+            echo $ajax->getJavascript();
85
+        }
86 86
 }
87 87
\ No newline at end of file
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.popupview.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -62,16 +62,16 @@  discard block
 block discarded – undo
62 62
     }
63 63
     
64 64
     /**
65
-	 * @see SugarView::_getModuleTitleParams()
66
-	 */
67
-	protected function _getModuleTitleParams($browserTitle = false)
68
-	{
69
-	    global $mod_strings;
65
+     * @see SugarView::_getModuleTitleParams()
66
+     */
67
+    protected function _getModuleTitleParams($browserTitle = false)
68
+    {
69
+        global $mod_strings;
70 70
 	    
71
-    	return array(
72
-    	   translate('LBL_MODULE_NAME','Administration'),
73
-    	   ModuleBuilderController::getModuleTitle(),
74
-    	   );
71
+        return array(
72
+            translate('LBL_MODULE_NAME','Administration'),
73
+            ModuleBuilderController::getModuleTitle(),
74
+            );
75 75
     }
76 76
 
77 77
 //    /*
@@ -101,12 +101,12 @@  discard block
 block discarded – undo
101 101
 
102 102
         if ($preview)
103 103
         {
104
-        	echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
104
+            echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
105 105
         } else
106 106
         {
107
-        	$ajax = $this->constructAjax () ;
108
-        	$ajax->addSection ( 'center', translate('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
109
-        	echo $ajax->getJavascript () ;
107
+            $ajax = $this->constructAjax () ;
108
+            $ajax->addSection ( 'center', translate('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
109
+            echo $ajax->getJavascript () ;
110 110
         }
111 111
     }
112 112
 
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
         $helpName = (isset( $_REQUEST['view']) && $_REQUEST['view']==MB_POPUPSEARCH) ? 'searchViewEditor' : 'popupListViewEditor';
152 152
         $smarty->assign ( 'helpName', $helpName ) ;
153 153
         $smarty->assign ( 'helpDefault', 'modify' ) ;
154
-   	 	if ($this->fromModuleBuilder) {
155
-			$mb = new ModuleBuilder ( ) ;
154
+            if ($this->fromModuleBuilder) {
155
+            $mb = new ModuleBuilder ( ) ;
156 156
             $module = & $mb->getPackageModule ( $this->editPackage, $this->editModule ) ;
157
-		    $smarty->assign('current_mod_strings', $module->getModStrings());
158
-		}
157
+            $smarty->assign('current_mod_strings', $module->getModStrings());
158
+        }
159 159
 
160 160
         $smarty->assign ( 'title', $this->_constructTitle () ) ;
161 161
         $groups = array ( ) ;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
                 {
172 172
                     if (substr ( $field [ 'width' ], - 1, 1 ) == '%')
173 173
                     {
174
-						$groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
174
+                        $groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
175 175
                     }
176 176
                 }
177 177
             }
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.property.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -49,16 +49,16 @@  discard block
 block discarded – undo
49 49
     }
50 50
     
51 51
     /**
52
-	 * @see SugarView::_getModuleTitleParams()
53
-	 */
54
-	protected function _getModuleTitleParams($browserTitle = false)
55
-	{
56
-	    global $mod_strings;
52
+     * @see SugarView::_getModuleTitleParams()
53
+     */
54
+    protected function _getModuleTitleParams($browserTitle = false)
55
+    {
56
+        global $mod_strings;
57 57
 	    
58
-    	return array(
59
-    	   translate('LBL_MODULE_NAME','Administration'),
60
-    	   ModuleBuilderController::getModuleTitle(),
61
-    	   );
58
+        return array(
59
+            translate('LBL_MODULE_NAME','Administration'),
60
+            ModuleBuilderController::getModuleTitle(),
61
+            );
62 62
     }
63 63
 
64 64
 	
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
                 $this->properties[substr($key,6)]['title'] = $value;
98 98
             }
99 99
         }
100
-     }
100
+        }
101 101
 
102 102
     function display()
103 103
     {
104 104
         global $mod_strings;
105
-    	$ajax = new AjaxCompose();
105
+        $ajax = new AjaxCompose();
106 106
         $smarty = new Sugar_Smarty();
107 107
         if (isset($_REQUEST['MB']) && $_REQUEST['MB'] == "1")
108 108
         {
@@ -111,11 +111,11 @@  discard block
 block discarded – undo
111 111
         }
112 112
 
113 113
         $selected_lang = (!empty($_REQUEST['selected_lang'])?$_REQUEST['selected_lang']:$_SESSION['authenticated_user_language']);
114
-		if(empty($selected_lang)){
115
-		    $selected_lang = $GLOBALS['sugar_config']['default_language'];
116
-		}
117
-		$smarty->assign('available_languages', get_languages());
118
-		$smarty->assign('selected_lang', $selected_lang);
114
+        if(empty($selected_lang)){
115
+            $selected_lang = $GLOBALS['sugar_config']['default_language'];
116
+        }
117
+        $smarty->assign('available_languages', get_languages());
118
+        $smarty->assign('selected_lang', $selected_lang);
119 119
 		
120 120
         ksort($this->properties);
121 121
 
Please login to merge, or discard this patch.