@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | return 0; // Module not active, we do nothing |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - $error=0; |
|
| 78 | + $error = 0; |
|
| 79 | 79 | |
| 80 | 80 | // Actions |
| 81 | 81 | if ($action == 'PROJECT_VALIDATE') { |
| 82 | 82 | if (!empty($conf->global->EVENTORGANIZATION_TASK_LABEL) && !empty($object->usage_organize_event)) { |
| 83 | 83 | $taskToDo = explode("\n", $conf->global->EVENTORGANIZATION_TASK_LABEL); |
| 84 | - if (is_array($taskToDo) && count($taskToDo)>0) { |
|
| 84 | + if (is_array($taskToDo) && count($taskToDo) > 0) { |
|
| 85 | 85 | // Load translation files required by the page |
| 86 | 86 | $langs->loadLangs(array("eventorganization")); |
| 87 | 87 | |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | $task->fk_project = $object->id; |
| 93 | 93 | $defaultref = ''; |
| 94 | 94 | $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON; |
| 95 | - if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) { |
|
| 96 | - require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php'; |
|
| 95 | + if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php")) { |
|
| 96 | + require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php'; |
|
| 97 | 97 | $modTask = new $obj; |
| 98 | 98 | $defaultref = $modTask->getNextValue($object->thirdparty, null); |
| 99 | 99 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | $result = $task->create($user); |
| 110 | 110 | if ($result < 0) { |
| 111 | - $this->errors=array_merge($this->errors, $task->errors); |
|
| 111 | + $this->errors = array_merge($this->errors, $task->errors); |
|
| 112 | 112 | $error++; |
| 113 | 113 | } |
| 114 | 114 | } |
@@ -81,12 +81,12 @@ |
||
| 81 | 81 | $response = array(); |
| 82 | 82 | while ($i < $num) { |
| 83 | 83 | $obj = $db->fetch_object($resql); |
| 84 | - $response[] = array('title'=>$obj->question,'ref'=>$obj->ref,'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url'=>$obj->url); |
|
| 84 | + $response[] = array('title'=>$obj->question, 'ref'=>$obj->ref, 'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)), 'url'=>$obj->url); |
|
| 85 | 85 | $i++; |
| 86 | 86 | } |
| 87 | 87 | } else { |
| 88 | 88 | dol_print_error($db); |
| 89 | 89 | } |
| 90 | - $response =json_encode($response); |
|
| 90 | + $response = json_encode($response); |
|
| 91 | 91 | echo $response; |
| 92 | 92 | } |
@@ -302,7 +302,7 @@ |
||
| 302 | 302 | |
| 303 | 303 | $multicurrency = new MultiCurrency($this->db); |
| 304 | 304 | |
| 305 | - if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) { |
|
| 305 | + if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) { |
|
| 306 | 306 | $langs->loadCacheCurrencies(''); |
| 307 | 307 | |
| 308 | 308 | $multicurrency->code = $conf->currency; |
@@ -214,16 +214,16 @@ |
||
| 214 | 214 | print '<table class="border tableforfield centpercent">'; |
| 215 | 215 | |
| 216 | 216 | print "<tr>"; |
| 217 | - print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>'; |
|
| 217 | + print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>'; |
|
| 218 | 218 | print dol_print_date($object->datesp, 'day'); |
| 219 | 219 | print '</td></tr>'; |
| 220 | 220 | |
| 221 | 221 | print "<tr>"; |
| 222 | - print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>'; |
|
| 222 | + print '<td>'.$langs->trans("DateEndPeriod").'</td><td>'; |
|
| 223 | 223 | print dol_print_date($object->dateep, 'day'); |
| 224 | 224 | print '</td></tr>'; |
| 225 | 225 | |
| 226 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>'; |
|
| 226 | + print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>'; |
|
| 227 | 227 | |
| 228 | 228 | print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>'; |
| 229 | 229 | |
@@ -132,7 +132,9 @@ |
||
| 132 | 132 | */ |
| 133 | 133 | |
| 134 | 134 | $form = new Form($db); |
| 135 | -if (isModEnabled('project')) $formproject = new FormProjets($db); |
|
| 135 | +if (isModEnabled('project')) { |
|
| 136 | + $formproject = new FormProjets($db); |
|
| 137 | +} |
|
| 136 | 138 | |
| 137 | 139 | $title = $langs->trans('Salary')." - ".$langs->trans('Documents'); |
| 138 | 140 | $help_url = ""; |
@@ -240,7 +240,7 @@ |
||
| 240 | 240 | if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) { |
| 241 | 241 | //print 'xx'.LIBXML_NOCDATA; |
| 242 | 242 | libxml_use_internal_errors(false); |
| 243 | - $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA|LIBXML_NOCDATA); |
|
| 243 | + $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA | LIBXML_NOCDATA); |
|
| 244 | 244 | } else { |
| 245 | 245 | if (!function_exists('xml_parser_create')) { |
| 246 | 246 | $this->error = 'Function xml_parser_create are not supported by your PHP'; |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | $result = getURLContent('https://sourceforge.net/projects/dolibarr/rss'); |
| 52 | 52 | //var_dump($result['content']); |
| 53 | 53 | if (function_exists('simplexml_load_string')) { |
| 54 | - $sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET); |
|
| 54 | + $sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET); |
|
| 55 | 55 | } else { |
| 56 | 56 | setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors'); |
| 57 | 57 | } |
@@ -165,13 +165,13 @@ |
||
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | if (GETPOST('target') == 'remote') { |
| 168 | - $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php. |
|
| 168 | + $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php. |
|
| 169 | 169 | |
| 170 | 170 | // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) |
| 171 | 171 | if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') { |
| 172 | 172 | $xmlfile = $xmlarray['content']; |
| 173 | 173 | //print "xmlfilestart".$xmlfile."xmlfileend"; |
| 174 | - $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET); |
|
| 174 | + $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET); |
|
| 175 | 175 | } else { |
| 176 | 176 | $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg']; |
| 177 | 177 | setEventMessages($errormsg, null, 'errors'); |
@@ -142,7 +142,7 @@ |
||
| 142 | 142 | |
| 143 | 143 | <div class="tagtd nowrap noborderbottom"> |
| 144 | 144 | <?php |
| 145 | - $selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ? 0 : $object->socid); |
|
| 145 | + $selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ? 0 : $object->socid); |
|
| 146 | 146 | $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?> |
| 147 | 147 | </div> |
| 148 | 148 | <div class="tagtd noborderbottom minwidth500imp"> |
@@ -152,7 +152,7 @@ |
||
| 152 | 152 | while ($i < $num) { |
| 153 | 153 | $objp = $db->fetch_object($resql); |
| 154 | 154 | $listofoppstatus[$objp->rowid] = $objp->percent; |
| 155 | - $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
| 155 | + $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
| 156 | 156 | $listofoppcode[$objp->rowid] = $objp->code; |
| 157 | 157 | switch ($objp->code) { |
| 158 | 158 | case 'PROSP': |