Completed
Branch develop (21bcc8)
by
unknown
19:13
created
doctemplates/websites/website_template-corporate/containers/page195.tpl.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -71,32 +71,32 @@
 block discarded – undo
71 71
     <br>
72 72
                       
73 73
      <?php
74
-     $weblangs->load("main");
74
+	 $weblangs->load("main");
75 75
      
76
-     if (function_exists('getPagesFromSearchCriterias'))
77
-     {
78
-         if (GETPOSTISSET('s'))
79
-         {
80
-             $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
81
-             if ($listofpages['code'] == 'OK')
82
-             {
83
-                 foreach($listofpages['list'] as $websitepagefound)
84
-                 {
85
-                    print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
86
-                 }
87
-             }
88
-             else
89
-             {
90
-                 // If error, show message
91
-                 print $listofpages['message'];
92
-             }
93
-         }
94
-     }
95
-     else
96
-     {
97
-         print $weblangs->trans("FeatureNotYetAvailable");
98
-     }
99
-     ?>
76
+	 if (function_exists('getPagesFromSearchCriterias'))
77
+	 {
78
+		 if (GETPOSTISSET('s'))
79
+		 {
80
+			 $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
81
+			 if ($listofpages['code'] == 'OK')
82
+			 {
83
+				 foreach($listofpages['list'] as $websitepagefound)
84
+				 {
85
+					print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
86
+				 }
87
+			 }
88
+			 else
89
+			 {
90
+				 // If error, show message
91
+				 print $listofpages['message'];
92
+			 }
93
+		 }
94
+	 }
95
+	 else
96
+	 {
97
+		 print $weblangs->trans("FeatureNotYetAvailable");
98
+	 }
99
+	 ?>
100 100
                       
101 101
 <br><br><br><br><br><br>
102 102
 </center>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page187.tpl.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@
 block discarded – undo
99 99
                       <p class="font-italic text-white">Follow Us:</p>
100 100
                       <ul class="list-inline">
101 101
                           <?php foreach($mysoc->socialnetworks as $key => $value) {
102
-                            print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>';
103
-                          } ?>
102
+							print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>';
103
+						  } ?>
104 104
                       </ul>
105 105
                     </div>
106 106
                   </div>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page190.tpl.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -59,45 +59,45 @@
 block discarded – undo
59 59
             <div class="container"><div class="text-align: center"><br>
60 60
             <h2>The crew...</h2><br> <br><br> 
61 61
             <?php 
62
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
63
-            $websitepage = new WebsitePage($db);
64
-            $fuser = new User($db);
65
-            $arrayofusers = array();
66
-            $MAXNB=10;
67
-            $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
68
-            $resql = $db->query($sql);
69
-            if (! $resql) dol_print_error($db);
70
-            while ($obj = $db->fetch_object($resql))
71
-            {
72
-                $arrayofusers[]=$obj->rowid;
73
-            }
62
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
63
+			$websitepage = new WebsitePage($db);
64
+			$fuser = new User($db);
65
+			$arrayofusers = array();
66
+			$MAXNB=10;
67
+			$sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
68
+			$resql = $db->query($sql);
69
+			if (! $resql) dol_print_error($db);
70
+			while ($obj = $db->fetch_object($resql))
71
+			{
72
+				$arrayofusers[]=$obj->rowid;
73
+			}
74 74
            
75
-            print '<div class="row justify-content-sm-center row-40">';
76
-            foreach($arrayofusers as $id)
77
-            {
78
-                $fuser->fetch($id);
75
+			print '<div class="row justify-content-sm-center row-40">';
76
+			foreach($arrayofusers as $id)
77
+			{
78
+				$fuser->fetch($id);
79 79
 
80
-                print '<div class="col-sm-8 col-md-7 col-lg-4">';
81
-                print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
82
-                print '<div class="post-boxed-img-wrap" style="height: 164px">';
83
-                if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
84
-                //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
85
-                else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
86
-                print '</div>';
87
-                print '<div class="post-boxed-caption">';
88
-                print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
89
-                print '<ul class="list-inline list-inline-dashed text-uppercase">';
90
-                //print '<li>September 24, 2018</li>';
91
-                if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
92
-                else print '<li></li>';
93
-                print '</ul>';
94
-                print '</div>';
95
-                print '</div>';
96
-                print '</div>';
97
-            }
98
-            print '</div>';
80
+				print '<div class="col-sm-8 col-md-7 col-lg-4">';
81
+				print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
82
+				print '<div class="post-boxed-img-wrap" style="height: 164px">';
83
+				if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
84
+				//print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
85
+				else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
86
+				print '</div>';
87
+				print '<div class="post-boxed-caption">';
88
+				print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
89
+				print '<ul class="list-inline list-inline-dashed text-uppercase">';
90
+				//print '<li>September 24, 2018</li>';
91
+				if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
92
+				else print '<li></li>';
93
+				print '</ul>';
94
+				print '</div>';
95
+				print '</div>';
96
+				print '</div>';
97
+			}
98
+			print '</div>';
99 99
 
100
-            ?>
100
+			?>
101 101
             </div></div>
102 102
         </section>
103 103
 
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page179.tpl.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -59,30 +59,30 @@
 block discarded – undo
59 59
             <div><br><div class="text-align: center">
60 60
             <!--<h2>The latest news...</h2><br><br><br> -->
61 61
             <?php 
62
-            $weblangs->load("main");
63
-            $fuser = new User($db);
64
-            $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
65
-            foreach($arrayofblogs as $blog)
66
-            {
67
-                print '<div class="row justify-content-sm-center row-40">';
68
-                print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
69
-                            print '<a class="centpercent" href="'.$blog->pageurl.'.php">';
70
-                            print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.str_replace('template-corporate', $website->ref, $blog->image) : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
71
-                            print '<div class="post-boxed-caption">';
72
-                            print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
73
-                            print '<ul class="list-inline list-inline-dashed text-uppercase">';
74
-                            print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
75
-                            $fuser->fetch($blog->fk_user_creat);
76
-                            print '<li><span>by<span> <span class="text-primary">'.$fuser->firstname.'</span></span></li>';
77
-                            print '</ul>';
78
-                            print '<span class="nohover">'.$blog->description.'</span>';
79
-                            print '</div>';
80
-                            //includeContainer($blog->pageurl);
81
-                            print '</a>';
82
-                print '</div>';
83
-                print '</div>';
84
-            }
85
-            ?>
62
+			$weblangs->load("main");
63
+			$fuser = new User($db);
64
+			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
65
+			foreach($arrayofblogs as $blog)
66
+			{
67
+				print '<div class="row justify-content-sm-center row-40">';
68
+				print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
69
+							print '<a class="centpercent" href="'.$blog->pageurl.'.php">';
70
+							print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.str_replace('template-corporate', $website->ref, $blog->image) : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
71
+							print '<div class="post-boxed-caption">';
72
+							print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
73
+							print '<ul class="list-inline list-inline-dashed text-uppercase">';
74
+							print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
75
+							$fuser->fetch($blog->fk_user_creat);
76
+							print '<li><span>by<span> <span class="text-primary">'.$fuser->firstname.'</span></span></li>';
77
+							print '</ul>';
78
+							print '<span class="nohover">'.$blog->description.'</span>';
79
+							print '</div>';
80
+							//includeContainer($blog->pageurl);
81
+							print '</a>';
82
+				print '</div>';
83
+				print '</div>';
84
+			}
85
+			?>
86 86
             </div></div>
87 87
         </section>
88 88
 
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page182.tpl.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -63,52 +63,52 @@
 block discarded – undo
63 63
             
64 64
             <section id="sectionnews" contenteditable="false" class="section-50 section-md-50 section-md-bottom-50">
65 65
             <?php
66
-            include_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
67
-            $jobposition = new RecruitmentJobPosition($db);
68
-            $fuser = new User($db);
69
-            $arrayofrecord = $jobposition->fetchAll('DESC', 'date_creation', 5, 0, array('status'=>'1,3,9'));
70
-            $weblangs->load("main");
71
-            foreach($arrayofrecord as $jobrecord)
72
-            {
73
-                print '<div class="row justify-content-sm-center row-40">';
74
-                print '<div class="container blog-box d-xl-inline-block" style="box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
75
-                            //print '<a href="/public/recruitment/view.php?id='.$jobrecord->id.'.php">';
76
-                            //print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.$blog->image : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
77
-                            print '<div class="post-boxed-caption">';
78
-                            print '<div class="post-boxed-title font-weight-bold">'.$jobrecord->label.'</div>';
79
-                            print '<ul class="list-inline list-inline-dashed">';
80
-                            print '<li><span class="text-primary">'.dol_print_date($jobrecord->date_creation, 'daytext', 'tzserver', $weblangs).'</span></li>';
81
-                            //$fuser->fetch($jobrecord->fk_user_recruitment);
82
-                            //print '<li><span>par<span> <span class="text-primary">'.$fuser->firstname.'</span></span></li>';
83
-                            //print '<li><span>Contact:<span> <span class="text-primary">Laurent Destailleur - [email protected]</span></span></li>';
84
-                            print '</ul>';
85
-                            print '</div>';
66
+			include_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
67
+			$jobposition = new RecruitmentJobPosition($db);
68
+			$fuser = new User($db);
69
+			$arrayofrecord = $jobposition->fetchAll('DESC', 'date_creation', 5, 0, array('status'=>'1,3,9'));
70
+			$weblangs->load("main");
71
+			foreach($arrayofrecord as $jobrecord)
72
+			{
73
+				print '<div class="row justify-content-sm-center row-40">';
74
+				print '<div class="container blog-box d-xl-inline-block" style="box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
75
+							//print '<a href="/public/recruitment/view.php?id='.$jobrecord->id.'.php">';
76
+							//print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.$blog->image : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
77
+							print '<div class="post-boxed-caption">';
78
+							print '<div class="post-boxed-title font-weight-bold">'.$jobrecord->label.'</div>';
79
+							print '<ul class="list-inline list-inline-dashed">';
80
+							print '<li><span class="text-primary">'.dol_print_date($jobrecord->date_creation, 'daytext', 'tzserver', $weblangs).'</span></li>';
81
+							//$fuser->fetch($jobrecord->fk_user_recruitment);
82
+							//print '<li><span>par<span> <span class="text-primary">'.$fuser->firstname.'</span></span></li>';
83
+							//print '<li><span>Contact:<span> <span class="text-primary">Laurent Destailleur - [email protected]</span></span></li>';
84
+							print '</ul>';
85
+							print '</div>';
86 86
 
87
-                            print '<div class="left" style="line-height: 1.5em; margin-top: 30px; margin-left: 20px; margin-right: 20px">';
88
-                            //includeContainer($blog->pageurl);
87
+							print '<div class="left" style="line-height: 1.5em; margin-top: 30px; margin-left: 20px; margin-right: 20px">';
88
+							//includeContainer($blog->pageurl);
89 89
                             
90
-                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_RECRUITED) {
91
-                                $langs->load('recruitment');
92
-                            	print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, 0, 'warning');
93
-                            	print '<br>';
94
-                            }
95
-                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_CANCELED) {
96
-                                $langs->load('recruitment');
97
-	                            print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, 0, 'warning');
98
-	                            print '<br>';
99
-                            }
90
+							if ($jobrecord->status == RecruitmentJobPosition::STATUS_RECRUITED) {
91
+								$langs->load('recruitment');
92
+								print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, 0, 'warning');
93
+								print '<br>';
94
+							}
95
+							if ($jobrecord->status == RecruitmentJobPosition::STATUS_CANCELED) {
96
+								$langs->load('recruitment');
97
+								print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, 0, 'warning');
98
+								print '<br>';
99
+							}
100 100
 
101 101
 
102
-                            print '<span class="nohover">'.$jobrecord->description.'</span>';
102
+							print '<span class="nohover">'.$jobrecord->description.'</span>';
103 103
                             
104
-                            print '<br><br><span>Contact:<span> <span class="text-primary">Laurent Destailleur - '.$jobrecord->email_recruiter.'</span></span>';
104
+							print '<br><br><span>Contact:<span> <span class="text-primary">Laurent Destailleur - '.$jobrecord->email_recruiter.'</span></span>';
105 105
                             
106
-                            print '</div>';
107
-                            //print '</a>';
108
-                print '</div>';
109
-                print '</div>';
110
-            }
111
-            ?>
106
+							print '</div>';
107
+							//print '</a>';
108
+				print '</div>';
109
+				print '</div>';
110
+			}
111
+			?>
112 112
             </section>
113 113
             </div></div>
114 114
         </section>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page189.tpl.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -536,11 +536,11 @@  discard block
 block discarded – undo
536 536
           <h1>Latest <span class="text-thin">News</span></h1>
537 537
           <div class="row justify-content-sm-center row-40">
538 538
             <?php 
539
-            $MAXNEWS = 3;
540
-            $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
541
-            foreach($arrayofblogs as $blog)
542
-            {
543
-                ?>
539
+			$MAXNEWS = 3;
540
+			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
541
+			foreach($arrayofblogs as $blog)
542
+			{
543
+				?>
544 544
                 <div class="col-sm-8 col-md-7 col-lg-4">
545 545
                   <div class="post-boxed d-xl-inline-block">
546 546
                     <a href="<?php echo $blog->pageurl ?>.php">
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
556 556
                   </div>
557 557
                 </div>
558 558
                 <?php 
559
-            }
560
-            ?>
559
+			}
560
+			?>
561 561
  
562 562
           </div>
563 563
         </div>
Please login to merge, or discard this patch.
websites/website_template-homesubmenu/containers/page202.tpl.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
 <body id="bodywebsite" class="bodywebsite bodywebpage-index">
39 39
 <!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
40 40
 <?php 
41
-    if (GETPOST('action') == 'sendmail')    {
42
-    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
43
-    $from = GETPOST('email', 'alpha');
44
-    $to = $mysoc->email;
45
-    $message = GETPOST('message', 'alpha');
46
-    $cmail = new CMailFile('Contact from website', $to, $from, $message);
47
-    if ($cmail->sendfile()) {
48
-        ?>
41
+	if (GETPOST('action') == 'sendmail')    {
42
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
43
+	$from = GETPOST('email', 'alpha');
44
+	$to = $mysoc->email;
45
+	$message = GETPOST('message', 'alpha');
46
+	$cmail = new CMailFile('Contact from website', $to, $from, $message);
47
+	if ($cmail->sendfile()) {
48
+		?>
49 49
         <script>
50 50
             alert("Message sent successfully !");
51 51
         </script>
Please login to merge, or discard this patch.
htdocs/adherents/class/adherent.class.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3231,12 +3231,12 @@
 block discarded – undo
3231 3231
 	}
3232 3232
 
3233 3233
 		/**
3234
-	 *	Return clicable link of object (with eventually picto)
3235
-	 *
3236
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
3237
-	 *  @param		array		$arraydata				Array of data
3238
-	 *  @return		string								HTML Code for Kanban thumb.
3239
-	 */
3234
+		 *	Return clicable link of object (with eventually picto)
3235
+		 *
3236
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
3237
+		 *  @param		array		$arraydata				Array of data
3238
+		 *  @return		string								HTML Code for Kanban thumb.
3239
+		 */
3240 3240
 	public function getKanbanView($option = '', $arraydata = null)
3241 3241
 	{
3242 3242
 		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
Please login to merge, or discard this patch.
htdocs/accountancy/class/accountancyexport.class.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2387,14 +2387,14 @@
 block discarded – undo
2387 2387
 	}
2388 2388
 
2389 2389
 	/**
2390
-	* Export format : iSuite Expert
2391
-	*
2392
-	* by OpenSolus [https://opensolus.fr]
2393
-	*
2390
+	 * Export format : iSuite Expert
2391
+	 *
2392
+	 * by OpenSolus [https://opensolus.fr]
2393
+	 *
2394 2394
 	 * @param 	array 		$objectLines 			data
2395 2395
 	 * @param 	resource	$exportFile				[=null] File resource to export or print if null
2396 2396
 	 * @return 	void
2397
-	*/
2397
+	 */
2398 2398
 	public function exportiSuiteExpert($objectLines, $exportFile = null)
2399 2399
 	{
2400 2400
 		$separator = ';';
Please login to merge, or discard this patch.