| @@ -22,11 +22,11 @@ discard block | ||
| 22 | 22 |  	  "<a href=\"$webserverURL/redirect.php?go=".htmlentities(urlencode('http://www.egroupware.org')).'">' | 
| 23 | 23 | */ | 
| 24 | 24 | |
| 25 | -	if(!function_exists('html_entity_decode')) | |
| 25 | +	if (!function_exists('html_entity_decode')) | |
| 26 | 26 |  	{ | 
| 27 | 27 | function html_entity_decode($given_html, $quote_style = ENT_QUOTES) | 
| 28 | 28 |  		{ | 
| 29 | - $trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style)); | |
| 29 | + $trans_table = array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style)); | |
| 30 | 30 | $trans_table['''] = "'"; | 
| 31 | 31 | return(strtr($given_html, $trans_table)); | 
| 32 | 32 | } | 
| @@ -45,17 +45,17 @@ discard block | ||
| 45 | 45 | |
| 46 | 46 | /* Only allow redirects from inside this eGroupware installation. */ | 
| 47 | 47 | $valid_referer = array(); | 
| 48 | -	$path = preg_replace('/\/[^\/]*$/','',$_SERVER['PHP_SELF']) . '/'; | |
| 48 | +	$path = preg_replace('/\/[^\/]*$/', '', $_SERVER['PHP_SELF']).'/'; | |
| 49 | 49 | array_push($valid_referer, $path); | 
| 50 | - array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $path); | |
| 51 | - array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $path); | |
| 50 | + array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$path); | |
| 51 | + array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$path); | |
| 52 | 52 | |
| 53 | 53 | $referrer = trim($_SERVER['HTTP_REFERER']); | 
| 54 | 54 | if ((!isset($_SERVER['HTTP_REFERER'])) || (empty($referrer))) | 
| 55 | 55 |  	{ | 
| 56 | 56 | echo "Only usable from within eGroupware.\n"; | 
| 57 | 57 | } | 
| 58 | - else if($_GET['go']) | |
| 58 | + else if ($_GET['go']) | |
| 59 | 59 |  	{ | 
| 60 | 60 | $allow = false; | 
| 61 | 61 | foreach ($valid_referer as $urlRoot) | 
| @@ -69,15 +69,15 @@ discard block | ||
| 69 | 69 | } | 
| 70 | 70 | if ($allow) | 
| 71 | 71 |  		{ | 
| 72 | - $url= html_entity_decode(urldecode($_GET['go'])); | |
| 72 | + $url = html_entity_decode(urldecode($_GET['go'])); | |
| 73 | 73 | unset($_GET['go']); | 
| 74 | 74 | /* Only add "&" if there is something to append. */ | 
| 75 | 75 | if (!empty($_GET)) | 
| 76 | 76 |  			{ | 
| 77 | - $url=$url."&".http_build_query($_GET); | |
| 77 | + $url = $url."&".http_build_query($_GET); | |
| 78 | 78 | } | 
| 79 | 79 | |
| 80 | -			Header('Location: ' . html_entity_decode(urldecode($url))); | |
| 80 | +			Header('Location: '.html_entity_decode(urldecode($url))); | |
| 81 | 81 | exit; | 
| 82 | 82 | } | 
| 83 | 83 | else | 
| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | 'name' => 'Ralf Becker', | 
| 21 | 21 | 'email' => '[email protected]' | 
| 22 | 22 | ); | 
| 23 | -$setup_info['filemanager']['license'] = 'GPL'; | |
| 23 | +$setup_info['filemanager']['license'] = 'GPL'; | |
| 24 | 24 | |
| 25 | 25 | /* The hooks this app includes, needed for hooks registration */ | 
| 26 | 26 | $setup_info['filemanager']['hooks']['settings'] = 'filemanager_hooks::settings'; | 
| @@ -89,7 +89,7 @@ discard block | ||
| 89 | 89 | $readonlys = null; | 
| 90 | 90 | $total = Sharing::so()->get_rows($query, $rows, $readonlys); | 
| 91 | 91 | |
| 92 | - foreach($rows as &$row) | |
| 92 | + foreach ($rows as &$row) | |
| 93 | 93 |  		{ | 
| 94 | 94 | if (substr($row['share_path'], 0, strlen(self::$tmp_dir)) === self::$tmp_dir) | 
| 95 | 95 |  			{ | 
| @@ -130,21 +130,21 @@ discard block | ||
| 130 | 130 | * @param array $content=null | 
| 131 | 131 | * @param string $msg='' | 
| 132 | 132 | */ | 
| 133 | - public function index(array $content=null) | |
| 133 | + public function index(array $content = null) | |
| 134 | 134 |  	{ | 
| 135 | 135 | if (!is_array($content)) | 
| 136 | 136 |  		{ | 
| 137 | 137 | $content = array( | 
| 138 | 138 | 'nm' => array( | 
| 139 | - 'get_rows' => 'filemanager.filemanager_shares.get_rows', // I method/callback to request the data for the rows eg. 'notes.bo.get_rows' | |
| 140 | - 'no_filter' => True, // current dir only | |
| 141 | - 'no_filter2' => True, // I disable the 2. filter (params are the same as for filter) | |
| 142 | - 'no_cat' => True, // I disable the cat-selectbox | |
| 143 | - 'lettersearch' => false, // I show a lettersearch | |
| 144 | - 'searchletter' => false, // I0 active letter of the lettersearch or false for [all] | |
| 145 | - 'start' => 0, // IO position in list | |
| 146 | - 'order' => 'share_created', // IO name of the column to sort after (optional for the sortheaders) | |
| 147 | - 'sort' => 'DESC', // IO direction of the sort: 'ASC' or 'DESC' | |
| 139 | + 'get_rows' => 'filemanager.filemanager_shares.get_rows', // I method/callback to request the data for the rows eg. 'notes.bo.get_rows' | |
| 140 | + 'no_filter' => True, // current dir only | |
| 141 | + 'no_filter2' => True, // I disable the 2. filter (params are the same as for filter) | |
| 142 | + 'no_cat' => True, // I disable the cat-selectbox | |
| 143 | + 'lettersearch' => false, // I show a lettersearch | |
| 144 | + 'searchletter' => false, // I0 active letter of the lettersearch or false for [all] | |
| 145 | + 'start' => 0, // IO position in list | |
| 146 | + 'order' => 'share_created', // IO name of the column to sort after (optional for the sortheaders) | |
| 147 | + 'sort' => 'DESC', // IO direction of the sort: 'ASC' or 'DESC' | |
| 148 | 148 | //'default_cols' => '!', // I columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns | 
| 149 | 149 | 'csv_fields' => false, // I false=disable csv export, true or unset=enable it with auto-detected fieldnames, | 
| 150 | 150 |  									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type) | 
| @@ -156,7 +156,7 @@ discard block | ||
| 156 | 156 | } | 
| 157 | 157 | elseif ($content['nm']['action']) | 
| 158 | 158 |  		{ | 
| 159 | - switch($content['nm']['action']) | |
| 159 | + switch ($content['nm']['action']) | |
| 160 | 160 |  			{ | 
| 161 | 161 | case 'delete': | 
| 162 | 162 |  					$where = array('share_owner' => $GLOBALS['egw_info']['user']['account_id']); | 
| @@ -28,13 +28,13 @@ discard block | ||
| 28 | 28 | $context['appname'] = 'filemanager'; | 
| 29 | 29 | |
| 30 | 30 | // Let parent handle the basic stuff | 
| 31 | - parent::__construct($context,$need_reload); | |
| 31 | + parent::__construct($context, $need_reload); | |
| 32 | 32 | |
| 33 | 33 | $this->nm_settings += array( | 
| 34 | 34 | 'get_rows' => 'filemanager.filemanager_favorite_portlet.get_rows', | 
| 35 | 35 | 'csv_export' => true, | 
| 36 | 36 | // Use a different template so it can be accessed from client side | 
| 37 | - 'template' => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows' ), | |
| 37 | + 'template' => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows'), | |
| 38 | 38 | // Filemanager needs this header, it's an important component for actions, but we reduce it to the minimum | 
| 39 | 39 | 'header_left' => 'filemanager.home.header_left', | 
| 40 | 40 | // Use a reduced column set for home, user can change if needed | 
| @@ -46,11 +46,11 @@ discard block | ||
| 46 | 46 | 'parent_id' => 'dir', | 
| 47 | 47 | 'is_parent' => 'mime', | 
| 48 | 48 | 'is_parent_value'=> Vfs::DIR_MIME_TYPE, | 
| 49 | -			'placeholder_actions' => array('mkdir','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink') | |
| 49 | +			'placeholder_actions' => array('mkdir', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink') | |
| 50 | 50 | ); | 
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | - public function exec($id = null, Etemplate &$etemplate = null) | |
| 53 | + public function exec($id = null, Etemplate&$etemplate = null) | |
| 54 | 54 |  	{ | 
| 55 | 55 | |
| 56 | 56 | $this->context['sel_options']['filter'] = array( | 
| @@ -80,7 +80,7 @@ discard block | ||
| 80 | 80 | $ui = new filemanager_ui(); | 
| 81 | 81 | $total = $ui->get_rows($query, $rows, $readonlys); | 
| 82 | 82 | // Change template to match selected view | 
| 83 | - if($query['view']) | |
| 83 | + if ($query['view']) | |
| 84 | 84 |  		{ | 
| 85 | 85 | $query['template'] = ($query['view'] == 'row' ? 'filemanager.home.rows' : 'filemanager.tile'); | 
| 86 | 86 | } | 
| @@ -103,14 +103,14 @@ discard block | ||
| 103 | 103 | // the etemplate exec to fire again. | 
| 104 | 104 | if ($content['nm']['action']) | 
| 105 | 105 |  		{ | 
| 106 | - $msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']); | |
| 107 | -			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg)); | |
| 108 | - foreach($content['nm']['selected'] as &$id) | |
| 106 | + $msg = filemanager_ui::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']); | |
| 107 | +			if ($msg) Api\Json\Response::get()->apply('egw.message', array($msg)); | |
| 108 | + foreach ($content['nm']['selected'] as &$id) | |
| 109 | 109 |  			{ | 
| 110 | 110 | $id = 'filemanager::'.$id; | 
| 111 | 111 | } | 
| 112 | 112 | // Directly request an update - this will get filemanager tab too | 
| 113 | -			Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected'])); | |
| 113 | +			Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected'])); | |
| 114 | 114 | } | 
| 115 | 115 | } | 
| 116 | 116 | } | 
| 117 | 117 | \ No newline at end of file | 
| @@ -36,11 +36,11 @@ discard block | ||
| 36 | 36 | } | 
| 37 | 37 | //print_r($config); exit; | 
| 38 | 38 | |
| 39 | -$uglify =& $config['uglify']; | |
| 39 | +$uglify = & $config['uglify']; | |
| 40 | 40 | |
| 41 | -foreach(Bundle::all() as $name => $files) | |
| 41 | +foreach (Bundle::all() as $name => $files) | |
| 42 | 42 |  { | 
| 43 | - if ($name == '.ts') continue; // ignore timestamp | |
| 43 | + if ($name == '.ts') continue; // ignore timestamp | |
| 44 | 44 | |
| 45 | 45 | // remove leading / from file-names | 
| 46 | 46 | array_walk($files, function(&$path) | 
| @@ -79,16 +79,16 @@ discard block | ||
| 79 | 79 | } | 
| 80 | 80 | |
| 81 | 81 | // add css for all templates and themes | 
| 82 | -$cssmin =& $config['cssmin']; | |
| 83 | -$GLOBALS['egw_info']['flags']['currentapp'] = '*grunt*'; // to no find any app.css files | |
| 84 | -$GLOBALS['egw_info']['server']['debug_minify'] = 'True'; // otherwise we would only get minified file | |
| 85 | -foreach(array('pixelegg','jdots')/*array_keys(Framework::list_templates())*/ as $template) | |
| 82 | +$cssmin = & $config['cssmin']; | |
| 83 | +$GLOBALS['egw_info']['flags']['currentapp'] = '*grunt*'; // to no find any app.css files | |
| 84 | +$GLOBALS['egw_info']['server']['debug_minify'] = 'True'; // otherwise we would only get minified file | |
| 85 | +foreach (array('pixelegg', 'jdots')/*array_keys(Framework::list_templates())*/ as $template) | |
| 86 | 86 |  { | 
| 87 | 87 | $GLOBALS['egw_info']['server']['template_set'] = $template; | 
| 88 | 88 | $tpl = Framework::factory(); | 
| 89 | 89 | $themes = $tpl->list_themes(); | 
| 90 | - if ($template == 'pixelegg') $themes[] = 'fw_mobile'; // this is for mobile devices | |
| 91 | - foreach($themes as $theme) | |
| 90 | + if ($template == 'pixelegg') $themes[] = 'fw_mobile'; // this is for mobile devices | |
| 91 | + foreach ($themes as $theme) | |
| 92 | 92 |  	{ | 
| 93 | 93 | // skip not working cssmin of pixelegg/traditional: Broken @import declaration of "../../etemplate/templates/default/etemplate2.css" | 
| 94 | 94 | if ($template == 'pixelegg' && $theme == 'traditional') continue; | 
| @@ -114,7 +114,7 @@ discard block | ||
| 114 | 114 |  $new_json = str_replace("\n", "\n\t", | 
| 115 | 115 |  	preg_replace_callback('/^( *)/m', function($matches) | 
| 116 | 116 |  	{ | 
| 117 | -		return str_repeat("\t", strlen($matches[1])/4); | |
| 117 | +		return str_repeat("\t", strlen($matches[1]) / 4); | |
| 118 | 118 | }, json_encode($config, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES))); | 
| 119 | 119 | |
| 120 | 120 |  $new_content = preg_replace('/^(\s*)"([a-z0-9]+)":/mi', '$1$2:', $new_json); | 
| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | 'category' => array( | 
| 56 | 56 | 'type' => 'select', | 
| 57 | 57 |  				'label' => lang('Choose a category'), | 
| 58 | - 'options' => array(), // specification of options is postponed into the get_user_interface function | |
| 58 | + 'options' => array(), // specification of options is postponed into the get_user_interface function | |
| 59 | 59 | 'multiple' => true, | 
| 60 | 60 | ), | 
| 61 | 61 | 'numWeeks' => array( | 
| @@ -107,8 +107,8 @@ discard block | ||
| 107 | 107 | function get_user_interface() | 
| 108 | 108 |  	{ | 
| 109 | 109 | // copied from bookmarks module. | 
| 110 | -		$cat = createobject('phpgwapi.categories','','calendar'); | |
| 111 | -		$cats = $cat->return_array('all',0,False,'','cat_name','',True); | |
| 110 | +		$cat = createobject('phpgwapi.categories', '', 'calendar'); | |
| 111 | +		$cats = $cat->return_array('all', 0, False, '', 'cat_name', '', True); | |
| 112 | 112 | $cat_ids = array(); | 
| 113 | 113 | while (list(,$category) = @each($cats)) | 
| 114 | 114 |  		{ | 
| @@ -119,12 +119,12 @@ discard block | ||
| 119 | 119 | $this->arguments['category']['multiple'] = 5; | 
| 120 | 120 | } | 
| 121 | 121 | |
| 122 | - if (! isset($GLOBALS['egw']->accounts)) | |
| 122 | + if (!isset($GLOBALS['egw']->accounts)) | |
| 123 | 123 |  		{ | 
| 124 | 124 | $GLOBALS['egw']->accounts = new Api\Accounts(); | 
| 125 | 125 | } | 
| 126 | - $this->accounts =& $GLOBALS['egw']->accounts; | |
| 127 | - $search_params=array( | |
| 126 | + $this->accounts = & $GLOBALS['egw']->accounts; | |
| 127 | + $search_params = array( | |
| 128 | 128 | 'type' => 'both', | 
| 129 | 129 | 'app' => 'calendar', | 
| 130 | 130 | ); | 
| @@ -134,7 +134,7 @@ discard block | ||
| 134 | 134 | // sort users and groups separately. | 
| 135 | 135 | if (isset($GLOBALS['sitemgr_info']['anonymous_user'])) | 
| 136 | 136 |  		{ | 
| 137 | - $anon_user = $this->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user'],'account_lid','u'); | |
| 137 | + $anon_user = $this->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user'], 'account_lid', 'u'); | |
| 138 | 138 | } | 
| 139 | 139 | else | 
| 140 | 140 |  		{ | 
| @@ -143,7 +143,7 @@ discard block | ||
| 143 | 143 | * Get possible sitemgr paths from the HTTP_REFERRER in order to unreveal the | 
| 144 | 144 | * anonymous user for the correct site. | 
| 145 | 145 | */ | 
| 146 | -			$sitemgr_path = preg_replace('/^[^\/]+:\/\/[^\/]+\/([^\?]*)(\?.*)*$/',"/\${1}",$_SERVER['HTTP_REFERER']); | |
| 146 | +			$sitemgr_path = preg_replace('/^[^\/]+:\/\/[^\/]+\/([^\?]*)(\?.*)*$/', "/\${1}", $_SERVER['HTTP_REFERER']); | |
| 147 | 147 | // Remove the trailing file- / pathname if any | 
| 148 | 148 |  			$sitemgr_path = preg_replace('/[^\/]*$/', '', $sitemgr_path); | 
| 149 | 149 | // Add leading slash if it has been lost. | 
| @@ -155,14 +155,14 @@ discard block | ||
| 155 | 155 | // Code adapted from sitemgr-site/index.php | 
| 156 | 156 | $site_urls = array(); | 
| 157 | 157 | $site_urls[] = $sitemgr_path; | 
| 158 | - $site_urls[] = ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $sitemgr_path; | |
| 159 | - $site_urls[] = $site_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $sitemgr_path; | |
| 158 | + $site_urls[] = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$sitemgr_path; | |
| 159 | + $site_urls[] = $site_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$sitemgr_path; | |
| 160 | 160 | |
| 161 | -			$anon_user = $this->accounts->name2id($GLOBALS['egw']->db->select('egw_sitemgr_sites','anonymous_user,anonymous_passwd,site_id', | |
| 162 | -				array('site_url' => $site_urls),__LINE__,__FILE__,false,'','sitemgr')->fetchColumn(),'account_lid','u'); | |
| 161 | +			$anon_user = $this->accounts->name2id($GLOBALS['egw']->db->select('egw_sitemgr_sites', 'anonymous_user,anonymous_passwd,site_id', | |
| 162 | +				array('site_url' => $site_urls), __LINE__, __FILE__, false, '', 'sitemgr')->fetchColumn(), 'account_lid', 'u'); | |
| 163 | 163 | } | 
| 164 | 164 | |
| 165 | - $anon_groups = $this->accounts->memberships($anon_user,true); | |
| 165 | + $anon_groups = $this->accounts->memberships($anon_user, true); | |
| 166 | 166 | foreach ($accounts as $entry) | 
| 167 | 167 |  		{ | 
| 168 | 168 | $is_group = false; | 
| @@ -170,9 +170,9 @@ discard block | ||
| 170 | 170 | $acl = new Acl($entry['account_id']); | 
| 171 | 171 | $acl->read_repository(); | 
| 172 | 172 | // get the rights for each account to check whether the anon user has read permissions. | 
| 173 | - $rights = $acl->get_rights($anon_user,'calendar'); | |
| 173 | + $rights = $acl->get_rights($anon_user, 'calendar'); | |
| 174 | 174 | // also add the anon user if it's his own calendar. | 
| 175 | - if (($rights & Acl::READ) || ($entry['account_id'] == $anon_user)) | |
| 175 | + if (($rights&Acl::READ) || ($entry['account_id'] == $anon_user)) | |
| 176 | 176 |  			{ | 
| 177 | 177 | $has_read_permissions = true; | 
| 178 | 178 | } | 
| @@ -182,8 +182,8 @@ discard block | ||
| 182 | 182 | // or ass permissions if this is the anon group's calendar. | 
| 183 | 183 | foreach ($anon_groups as $parent_group) | 
| 184 | 184 |  				{ | 
| 185 | - $rights = $acl->get_rights($parent_group,'calendar'); | |
| 186 | - if (($rights & Acl::READ) || ($entry['account_id'] == $parent_group)) | |
| 185 | + $rights = $acl->get_rights($parent_group, 'calendar'); | |
| 186 | + if (($rights&Acl::READ) || ($entry['account_id'] == $parent_group)) | |
| 187 | 187 |  					{ | 
| 188 | 188 | $has_read_permissions = true; | 
| 189 | 189 | break; | 
| @@ -199,7 +199,7 @@ discard block | ||
| 199 | 199 | } | 
| 200 | 200 | else | 
| 201 | 201 |  				{ | 
| 202 | - $users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'],$entry['account_firstname'],$entry['account_lastname']); | |
| 202 | + $users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'], $entry['account_firstname'], $entry['account_lastname']); | |
| 203 | 203 | } | 
| 204 | 204 | } | 
| 205 | 205 | } | 
| @@ -219,7 +219,7 @@ discard block | ||
| 219 | 219 | return parent::get_user_interface(); | 
| 220 | 220 | } | 
| 221 | 221 | |
| 222 | - function get_content(&$arguments,$properties) | |
| 222 | + function get_content(&$arguments, $properties) | |
| 223 | 223 |  	{ | 
| 224 | 224 | $html = ""; | 
| 225 | 225 |  		Api\Translation::add_app('calendar'); | 
| @@ -227,33 +227,32 @@ discard block | ||
| 227 | 227 | $this->ui->allowEdit = false; | 
| 228 | 228 | $this->ui->use_time_grid = isset($arguments['grid']) ? $arguments['grid'] : false; | 
| 229 | 229 | |
| 230 | - $weeks = $arguments['numWeeks'] ? (int) $arguments['numWeeks'] : 2; | |
| 230 | + $weeks = $arguments['numWeeks'] ? (int)$arguments['numWeeks'] : 2; | |
| 231 | 231 | |
| 232 | -		if (($arguments['acceptDateParam']) && (get_var('date',array('POST','GET')))) | |
| 232 | +		if (($arguments['acceptDateParam']) && (get_var('date', array('POST', 'GET')))) | |
| 233 | 233 |  		{ | 
| 234 | -			$start = (int) (strtotime(get_var('date',array('POST','GET'))) + | |
| 234 | +			$start = (int)(strtotime(get_var('date', array('POST', 'GET'))) + | |
| 235 | 235 | (60 * 60 * 24 * 7 * $dateOffset)); | 
| 236 | 236 | } | 
| 237 | 237 | else | 
| 238 | 238 |  		{ | 
| 239 | - $start = (int) ($this->bo->now_su + | |
| 239 | + $start = (int)($this->bo->now_su + | |
| 240 | 240 | (60 * 60 * 24 * 7 * $dateOffset)); | 
| 241 | 241 | } | 
| 242 | 242 | $start = new Api\DateTime($start); | 
| 243 | 243 | $start->setWeekstart(); | 
| 244 | 244 |  		$first = $start->format('ts'); | 
| 245 | -		$last = strtotime("+$weeks weeks",$first) - 1; | |
| 245 | +		$last = strtotime("+$weeks weeks", $first) - 1; | |
| 246 | 246 | |
| 247 | 247 | if ($arguments['showTitle']) | 
| 248 | 248 |  		{ | 
| 249 | 249 |  			$html .= '<div id="divAppboxHeader">'.$GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Weekview').": "; | 
| 250 | -			$html .= lang('After %1',$this->bo->long_date($first)); | |
| 250 | +			$html .= lang('After %1', $this->bo->long_date($first)); | |
| 251 | 251 | $html .= "</div>"; | 
| 252 | 252 | } | 
| 253 | 253 | |
| 254 | 254 | // set the search parameters | 
| 255 | - $search_params = Array | |
| 256 | - ( | |
| 255 | + $search_params = Array( | |
| 257 | 256 | 'offset' => false, | 
| 258 | 257 | 'order' => 'cal_start ASC', | 
| 259 | 258 | 'start' => $first, | 
| @@ -288,19 +287,19 @@ discard block | ||
| 288 | 287 | $html .= '<!-- END Calendar info -->'."\n"; | 
| 289 | 288 | unset($css_file); | 
| 290 | 289 | // we add DAY_s/2 to $this->first (using 12h), to deal with daylight saving changes | 
| 291 | -		for ($week_start = $first; $week_start < $last; $week_start = strtotime("+1 week",$week_start)) | |
| 290 | +		for ($week_start = $first; $week_start < $last; $week_start = strtotime("+1 week", $week_start)) | |
| 292 | 291 |  		{ | 
| 293 | 292 | $week = array(); | 
| 294 | 293 | for ($i = 0; $i < 7; ++$i) | 
| 295 | 294 |  			{ | 
| 296 | -				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days",$week_start) : $week_start); | |
| 295 | +				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days", $week_start) : $week_start); | |
| 297 | 296 | $week[$day_ymd] = array_shift($rows); | 
| 298 | 297 | } | 
| 299 | 298 | $week_view = array( | 
| 300 | 299 | 'menuaction' => false, | 
| 301 | 300 | 'date' => $this->bo->date2string($week_start), | 
| 302 | 301 | ); | 
| 303 | -			$title = lang('Wk').' '.adodb_date('W',$week_start); | |
| 302 | +			$title = lang('Wk').' '.adodb_date('W', $week_start); | |
| 304 | 303 | if (!isset($GLOBALS['egw']->template)) | 
| 305 | 304 |  			{ | 
| 306 | 305 | $GLOBALS['egw']->template = new Framework\Template; | 
| @@ -15,7 +15,7 @@ | ||
| 15 | 15 | $setup_info['calendar']['enable'] = 1; | 
| 16 | 16 | $setup_info['calendar']['index'] = 'calendar.calendar_uiviews.index&ajax=true'; | 
| 17 | 17 | |
| 18 | -$setup_info['calendar']['license'] = 'GPL'; | |
| 18 | +$setup_info['calendar']['license'] = 'GPL'; | |
| 19 | 19 | $setup_info['calendar']['description'] = | 
| 20 | 20 | 'Powerful group calendar with meeting request system and ACL security.'; | 
| 21 | 21 | $setup_info['calendar']['note'] = | 
| @@ -24,7 +24,7 @@ discard block | ||
| 24 | 24 | 'Arab Standard Time' => 'Asia/Riyadh', | 
| 25 | 25 | 'Arabian Standard Time' => 'Asia/Dubai', | 
| 26 | 26 | 'Arabic Standard Time' => 'Asia/Baghdad', | 
| 27 | - 'Argentina Standard Time' => 'America/Argentina/Buenos_Aires', // was 'America/Buenos_Aires', | |
| 27 | + 'Argentina Standard Time' => 'America/Argentina/Buenos_Aires', // was 'America/Buenos_Aires', | |
| 28 | 28 | 'Atlantic Standard Time' => 'America/Halifax', | 
| 29 | 29 | 'Azerbaijan Standard Time' => 'Asia/Baku', | 
| 30 | 30 | 'Azores Standard Time' => 'Atlantic/Azores', | 
| @@ -59,7 +59,7 @@ discard block | ||
| 59 | 59 | 'Greenland Standard Time' => 'America/Godthab', | 
| 60 | 60 | 'Greenwich Standard Time' => 'Atlantic/Reykjavik', | 
| 61 | 61 | 'Hawaiian Standard Time' => 'Pacific/Honolulu', | 
| 62 | - 'India Standard Time' => 'Asia/Kolkata', // Asia/Calcutta is an alias to Asia/Kolkata | |
| 62 | + 'India Standard Time' => 'Asia/Kolkata', // Asia/Calcutta is an alias to Asia/Kolkata | |
| 63 | 63 | 'Iran Standard Time' => 'Asia/Tehran', | 
| 64 | 64 | 'Israel Standard Time' => 'Asia/Jerusalem', | 
| 65 | 65 | 'Jordan Standard Time' => 'Asia/Amman', | 
| @@ -198,7 +198,7 @@ discard block | ||
| 198 | 198 | 'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein', | 
| 199 | 199 | |
| 200 | 200 | // various aliases collected over time | 
| 201 | - 'America/Creston' => 'America/Dawson_Creek', // not in sqlight DB of Thunderbird version 1.2011n, Dawson Creek is also UTC-7 without DS | |
| 201 | + 'America/Creston' => 'America/Dawson_Creek', // not in sqlight DB of Thunderbird version 1.2011n, Dawson Creek is also UTC-7 without DS | |
| 202 | 202 | 'Armenian Standard Time' => 'Asia/Yerevan', | 
| 203 | 203 | 'Asia/Katmandu' => 'Asia/Kathmandu', | 
| 204 | 204 | 'Asia/Calcutta' => 'Asia/Kolkata', | 
| @@ -10,17 +10,17 @@ | ||
| 10 | 10 | */ | 
| 11 | 11 | |
| 12 | 12 | // enable auto-loading of holidays from localhost by default | 
| 13 | -foreach(array( | |
| 13 | +foreach (array( | |
| 14 | 14 | 'auto_load_holidays' => 'True', | 
| 15 | 15 | 'holidays_url_path' => 'localhost', | 
| 16 | 16 | ) as $name => $value) | 
| 17 | 17 |  { | 
| 18 | - $oProc->insert($GLOBALS['egw_setup']->config_table,array( | |
| 18 | + $oProc->insert($GLOBALS['egw_setup']->config_table, array( | |
| 19 | 19 | 'config_value' => $value, | 
| 20 | - ),array( | |
| 20 | + ), array( | |
| 21 | 21 | 'config_app' => 'phpgwapi', | 
| 22 | 22 | 'config_name' => $name, | 
| 23 | - ),__FILE__,__LINE__); | |
| 23 | + ), __FILE__, __LINE__); | |
| 24 | 24 | } | 
| 25 | 25 | |
| 26 | 26 | // import timezone data |