Completed
Push — develop ( c72359...458179 )
by Daniel
10:45
created
controller/upload.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$this->set_filename($file);
93 93
 
94 94
 		$user_dir = $this->get_user_dir();
95
-		$destination = rtrim($this->upload_dir . $user_dir, '/');
95
+		$destination = rtrim($this->upload_dir.$user_dir, '/');
96 96
 		$file->move_file($destination, true);
97 97
 
98 98
 		if (sizeof($file->error))
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		}
103 103
 		else
104 104
 		{
105
-			$json_data['location'] = $user_dir . $file->get('realname');
105
+			$json_data['location'] = $user_dir.$file->get('realname');
106 106
 		}
107 107
 	}
108 108
 
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 		// if user does not have root access, they must have a directory
117 117
 		if (!$this->auth->acl_get('a_sm_filemanager'))
118 118
 		{
119
-			$user_dir = 'users/' . $this->user->data['username'] . '/';
119
+			$user_dir = 'users/'.$this->user->data['username'].'/';
120 120
 
121
-			$destination = $this->phpbb_root_path . $this->upload_dir . $user_dir;
121
+			$destination = $this->phpbb_root_path.$this->upload_dir.$user_dir;
122 122
 
123 123
 			if (!is_dir($destination))
124 124
 			{
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 * @param \phpbb\files\filespec $file
134 134
 	 * @return void
135 135
 	 */
136
-	protected function set_filename(\phpbb\files\filespec &$file)
136
+	protected function set_filename(\phpbb\files\filespec & $file)
137 137
 	{
138 138
 		$mode = 'real';
139 139
 		$prefix = '';
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,7 @@
 block discarded – undo
99 99
 		{
100 100
 			$file->remove();
101 101
 			$json_data['message'] = implode('<br />', $file->error);
102
-		}
103
-		else
102
+		} else
104 103
 		{
105 104
 			$json_data['location'] = $user_dir . $file->get('realname');
106 105
 		}
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 	public function load_permission_language(\phpbb\event\data $event)
69 69
 	{
70 70
 		$permissions = $event['permissions'];
71
-		$permissions['a_sm_settings']		= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
72
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
73
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
71
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
72
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
73
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
74 74
 		$permissions['a_sm_filemanager']	= array('lang' => 'ACL_A_SM_FILEMANAGER', 'cat' => 'misc');
75 75
 		$permissions['u_sm_filemanager']	= array('lang' => 'ACL_U_SM_FILEMANAGER', 'cat' => 'misc');
76 76
 		$event['permissions'] = $permissions;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function add_viewonline_location(\phpbb\event\data $event)
83 83
 	{
84
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
84
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
85 85
 		{
86 86
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
87 87
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.