Typesetter / Typesetter

addons/--Simple_Search/SimpleSearch.php

Doc Comments +11 added lines

@@ -237,6 +237,9 @@ 
 	}
 
 
+	/**
+	 * @param string $pattern
+	 */
 	function SearchPages($pattern){
 		global $gp_titles, $gp_index;
 
@@ -288,6 +291,10 @@ 
 
 
 	//try to search in the blog
+
+	/**
+	 * @param string $pattern
+	 */
 	function SearchBlog($pattern){
 		global $dataDir, $gp_index, $gp_titles, $config;
 
@@ -357,6 +364,10 @@ 
 
 	// same as before in SerchPreg() but saves in $this->file
 	// and uses different links for blog findings
+
+	/**
+	 * @param string $content
+	 */
 	function findString(&$content, &$pattern, &$title, $link='', $link_query = ''){
 
 		$content = str_replace('>','> ',$content);

Spacing +38 added lines, -38 removed lines

@@ -51,10 +51,10 @@ 
 		$this->GetConfig();
 
 		if( common::LoggedIn() ){
-			$page->admin_links[] = array('Special_Search','Configuration','cmd=config');
+			$page->admin_links[] = array('Special_Search', 'Configuration', 'cmd=config');
 			$cmd = common::GetCommand();
 
-			switch($cmd){
+			switch( $cmd ){
 				case 'save_config':
 					if( $this->SaveConfig() ){
 						break;
@@ -67,7 +67,7 @@ 
 			}
 		}
 
-		$query =& $_GET['q'];
+		$query = & $_GET['q'];
 
 		echo '<div class="search_results">';
 		echo '<form action="'.common::GetUrl('Special_Search').'" method="get">';
@@ -78,7 +78,7 @@ 
 		echo '<input name="q" type="text" class="text" value="'.htmlspecialchars($query).'"/>';
 		echo '<input type="hidden" name="src" value="gadget" /> ';
 		$html = '<input type="submit" name="" class="submit" value="%s" />';
-		echo gpOutput::GetAddonText('Search',$html);
+		echo gpOutput::GetAddonText('Search', $html);
 		echo '</h2>';
 		echo '</form>';
 
@@ -90,8 +90,8 @@ 
 
 			$pattern = '#(';
 			$bar = '';
-			foreach($words as $word){
-				$pattern .= $bar.preg_quote($word,'#');
+			foreach( $words as $word ){
+				$pattern .= $bar.preg_quote($word, '#');
 				$bar = '|';
 			}
 			$pattern .= ')#Si';
@@ -101,7 +101,7 @@ 
 		}
 
 		if( count($this->files) > 0 ){
-			foreach($this->files as $result){
+			foreach( $this->files as $result ){
 				echo $result;
 			}
 		}else{
@@ -123,7 +123,7 @@ 
 			include($this->config_file);
 		}
 
-		$search_config += array('search_blog'=>true,'search_hidden'=>false);
+		$search_config += array('search_blog'=>true, 'search_hidden'=>false);
 		$this->search_config = $search_config;
 
 	}
@@ -142,7 +142,7 @@ 
 			$search_config['search_blog'] = false;
 		}
 
-		if( gpFiles::SaveArray($this->config_file,'search_config',$search_config) ){
+		if( gpFiles::SaveArray($this->config_file, 'search_config', $search_config) ){
 			message($langmessage['SAVED']);
 			$this->search_config = $search_config;
 			return true;
@@ -155,7 +155,7 @@ 
 	}
 
 
-	function Config($array=array()){
+	function Config($array = array()){
 		global $langmessage, $addonFolderName, $gp_index;
 
 
@@ -229,7 +229,7 @@ 
 
 		echo '</table>';
 
-		echo common::Link('Admin_Theme_Content',$langmessage['editable_text'],'cmd=addontext&addon='.urlencode($addonFolderName),' title="'.urlencode($langmessage['editable_text']).'" name="gpabox" ');
+		echo common::Link('Admin_Theme_Content', $langmessage['editable_text'], 'cmd=addontext&addon='.urlencode($addonFolderName), ' title="'.urlencode($langmessage['editable_text']).'" name="gpabox" ');
 
 		echo '</form>';
 
@@ -244,8 +244,8 @@ 
 
 
 		ob_start();
-		foreach($gp_index as $title => $index){
-			$this->SearchPage($pattern,$title,$index);
+		foreach( $gp_index as $title => $index ){
+			$this->SearchPage($pattern, $title, $index);
 		}
 		$empty = ob_get_clean();
 
@@ -253,7 +253,7 @@ 
 		$this->ReduceResults();
 	}
 
-	function SearchPage($pattern,$title,$index){
+	function SearchPage($pattern, $title, $index){
 		global $gp_menu;
 
 		$full_path = gpFiles::PageFile($title);
@@ -273,7 +273,7 @@ 
 			return;
 		}
 		$content = '';
-		foreach($file_sections as $section){
+		foreach( $file_sections as $section ){
 			if( !isset($section['content']) ){
 				continue;
 			}
@@ -300,7 +300,7 @@ 
 			return;
 		}
 
-		$slug = array_search($blog_index,$gp_index);
+		$slug = array_search($blog_index, $gp_index);
 		$addon = $gp_titles[$blog_index]['addon'];
 		$blog_label = $gp_titles[$blog_index]['label'];
 
@@ -321,18 +321,18 @@ 
 		}
 
 		require($full_path);
-		$fileIndexMax = floor($blogData['post_index']/20); // '20' I found in SimpleBlogCommon.php function GetPostFile (line 62)
+		$fileIndexMax = floor($blogData['post_index'] / 20); // '20' I found in SimpleBlogCommon.php function GetPostFile (line 62)
 
-		for ($fileIndex = 0; $fileIndex <= $fileIndexMax; $fileIndex++) {
+		for( $fileIndex = 0; $fileIndex <= $fileIndexMax; $fileIndex++ ){
 			$postFile = $blog_data_folder.'/posts_'.$fileIndex.'.php';
 			if( !file_exists($postFile) ){
 				continue;
 			}
 			require($postFile);
 
-			foreach($posts as $id => $post){
-				$title = $blog_label.': '.str_replace('_',' ',$post['title']);
-				$content = str_replace('_',' ',$post['title']).' '.$post['content'];
+			foreach( $posts as $id => $post ){
+				$title = $blog_label.': '.str_replace('_', ' ', $post['title']);
+				$content = str_replace('_', ' ', $post['title']).' '.$post['content'];
 				$this->findString($content, $pattern, $title, $slug, '?cmd=post&id='.$id);
 			}
 			$posts = array();
@@ -357,29 +357,29 @@ 
 
 	// same as before in SerchPreg() but saves in $this->file
 	// and uses different links for blog findings
-	function findString(&$content, &$pattern, &$title, $link='', $link_query = ''){
+	function findString(&$content, &$pattern, &$title, $link = '', $link_query = ''){
 
-		$content = str_replace('>','> ',$content);
+		$content = str_replace('>', '> ', $content);
 		$content = strip_tags($content);
-		$match_count = preg_match_all($pattern,$content,$matches,PREG_OFFSET_CAPTURE);
+		$match_count = preg_match_all($pattern, $content, $matches, PREG_OFFSET_CAPTURE);
 		if( $match_count < 1 ){
 			return;
 		}
-		$rating = $match_count/strlen($content);
+		$rating = $match_count / strlen($content);
 
 		$result = '<div>';
 		$result .= '<b>';
 		$label = common::GetLabel($title);
-		if(empty($link)){
-			$result .= common::Link($title,$label,$link_query);
+		if( empty($link) ){
+			$result .= common::Link($title, $label, $link_query);
 		}else{
-			$result .= common::Link($link,$label,$link_query);
+			$result .= common::Link($link, $label, $link_query);
 		}
 
 		$result .= '</b>';
 		$result .= '<p>';
 
-		$content = str_replace(array("\n","\r","\t"),array(' ',' ',' '),$content);
+		$content = str_replace(array("\n", "\r", "\t"), array(' ', ' ', ' '), $content);
 
 		//reduce a little bit
 		$start = $matches[0][0][1];
@@ -388,26 +388,26 @@ 
 		$i = 0;
 		do{
 			$i++;
-			$start_offset = $i*10;
-			$start = max(0,$start-$start_offset);
-			$trimmed = substr($content,$start,300);
-			$space = strpos($trimmed,' ');
+			$start_offset = $i * 10;
+			$start = max(0, $start-$start_offset);
+			$trimmed = substr($content, $start, 300);
+			$space = strpos($trimmed, ' ');
 			if( $space < $start_offset ){
-				$content = substr($trimmed,$space);
+				$content = substr($trimmed, $space);
 				break;
 			}
-		}while( ($start-$start_offset) > 0);
+		}while( ($start-$start_offset) > 0 );
 
 
 		//find a space at the end
 		if( strlen($content) > 250 ){
-			$space2 = strpos($content,' ',$space+220);
+			$space2 = strpos($content, ' ', $space+220);
 			if( $space2 > 0 ){
-				$content = substr($content,0,$space2);
+				$content = substr($content, 0, $space2);
 			}
 		}
 
-		$result .= preg_replace($pattern,'<b>\1</b>',$content);
+		$result .= preg_replace($pattern, '<b>\1</b>', $content);
 
 		$result .= '</p>';
 		$result .= '</div>';

Braces +7 added lines, -7 removed lines

@@ -104,7 +104,7 @@ 
 			foreach($this->files as $result){
 				echo $result;
 			}
-		}else{
+		} else{
 			echo '<p>';
 			echo gpOutput::GetAddonText('Sorry, there weren\'t any results for your search. ');
 			echo '</p>';
@@ -133,12 +133,12 @@ 
 
 		if( isset($_POST['search_hidden']) ){
 			$search_config['search_hidden'] = true;
-		}else{
+		} else{
 			$search_config['search_hidden'] = false;
 		}
 		if( isset($_POST['search_blog']) ){
 			$search_config['search_blog'] = true;
-		}else{
+		} else{
 			$search_config['search_blog'] = false;
 		}
 
@@ -182,7 +182,7 @@ 
 			echo '<td>';
 			if( isset($array['search_hidden']) && $array['search_hidden'] ){
 				echo '<input type="checkbox" name="search_hidden" checked="checked" value="true" />';
-			}else{
+			} else{
 				echo '<input type="checkbox" name="search_hidden" value="true" />';
 			}
 			echo '</td>';
@@ -204,7 +204,7 @@ 
 
 			if( isset($array['search_blog']) && $array['search_blog'] ){
 				echo '<input type="checkbox" name="search_blog" checked="checked" value="true" '.$disabled.'/>';
-			}else{
+			} else{
 				echo '<input type="checkbox" name="search_blog" value="true" '.$disabled.'/>';
 			}
 			echo '</td>';
@@ -308,7 +308,7 @@ 
 		$addon_info = $config['addons'][$addon];
 		if( isset($addon_info['data_folder']) ){
 			$blog_data_folder = $dataDir.'/data/_addondata/'.$addon_info['data_folder'];
-		}else{
+		} else{
 			$blog_data_folder = $dataDir.'/data/_addondata/'.$addon;
 		}
 
@@ -372,7 +372,7 @@ 
 		$label = common::GetLabel($title);
 		if(empty($link)){
 			$result .= common::Link($title,$label,$link_query);
-		}else{
+		} else{
 			$result .= common::Link($link,$label,$link_query);
 		}
 

include/admin/Addons.php

Doc Comments +1 added lines

@@ -141,6 +141,7 @@
 	/**
 	 * Get a list of folders within $dir that
 	 *
+	 * @param string $relative
 	 */
 	function GetCleanFolders($relative){
 		global $dataDir;

Braces +4 added lines, -4 removed lines

@@ -212,7 +212,7 @@ 
 
 		if( isset($info['disabled']) ){
 			return \gp\tool::Link('Admin/Addons',str_replace('_',' ',$name).' ('.$langmessage['disabled'].')','cmd=enable&addon='.rawurlencode($info['addon']).'&gadget='.rawurlencode($name),'data-cmd="gpajax" class="gadget_link_'.md5($name).'"');
-		}else{
+		} else{
 			return \gp\tool::Link('Admin/Addons',str_replace('_',' ',$name) .' ('.$langmessage['enabled'].')','cmd=disable&addon='.rawurlencode($info['addon']).'&gadget='.rawurlencode($name),'data-cmd="gpajax" class="gadget_link_'.md5($name).'"');
 		}
 
@@ -269,7 +269,7 @@ 
 			echo ' <input type="submit" value="'.$langmessage['Close'].'" class="admin_box_close" /> ';
 			echo '</p>';
 
-		}else{
+		} else{
 
 			echo $langmessage['confirm_uninstall'];
 
@@ -384,7 +384,7 @@ 
 				$id = $info['Addon_Unique_ID'];
 				if( !isset($versions[$id]) ){
 					$versions[$id] = $info['Addon_Version'];
-				}elseif( version_compare($versions[$id],$info['Addon_Version'],'<') ){
+				} elseif( version_compare($versions[$id],$info['Addon_Version'],'<') ){
 					$versions[$id] = $info['Addon_Version'];
 					continue;
 				}
@@ -457,7 +457,7 @@ 
 
 		if( count($this->avail_addons) == 0 ){
 			//echo ' -empty- ';
-		}else{
+		} else{
 			echo '<table class="bordered full_width">';
 			echo '<tr><th>';
 			echo $langmessage['name'];

Spacing +71 added lines, -71 removed lines

@@ -29,7 +29,7 @@ 
 	public $dataFile;
 
 
-	function __construct( $args ){
+	function __construct($args){
 		global $langmessage;
 
 		parent::__construct($args);
@@ -37,15 +37,15 @@ 
 		$this->InitRating();
 		$this->GetData();
 
-		$this->page->head_js[]		= '/include/js/auto_width.js';
-		$this->avail_addons			= $this->GetAvailAddons();
+		$this->page->head_js[] = '/include/js/auto_width.js';
+		$this->avail_addons = $this->GetAvailAddons();
 
 	}
 
 	function RunScript(){
 
 		$cmd = \gp\tool::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 
 			case 'LocalInstall':
 				$this->LocalInstall();
@@ -85,7 +85,7 @@ 
 
 
 		//single addon
-		$request_parts = explode('/',$this->page->requested);
+		$request_parts = explode('/', $this->page->requested);
 		if( count($request_parts) > 2 ){
 			$this->ShowAddon($request_parts[2]);
 			return;
@@ -114,19 +114,19 @@ 
 
 		//check against folders used by addons
 		$addons = $config['addons'];
-		foreach($addons as $addon_key => $info){
+		foreach( $addons as $addon_key => $info ){
 			$addon_config = \gp\tool\Plugins::GetAddonConfig($addon_key);
-			if( array_key_exists($addon_config['code_folder_part'],$code_folders) ){
+			if( array_key_exists($addon_config['code_folder_part'], $code_folders) ){
 				$code_folders[$addon_config['code_folder_part']] = false;
 			}
-			if( array_key_exists($addon_config['data_folder_part'],$data_folders) ){
+			if( array_key_exists($addon_config['data_folder_part'], $data_folders) ){
 				$data_folders[$addon_config['data_folder_part']] = false;
 			}
 		}
 
 		//remove unused folders
-		$folders = array_filter($code_folders) + array_filter($data_folders);
-		foreach($folders as $folder => $full_path){
+		$folders = array_filter($code_folders)+array_filter($data_folders);
+		foreach( $folders as $folder => $full_path ){
 			\gp\tool\Files::RmAll($full_path);
 		}
 
@@ -145,7 +145,7 @@ 
 
 		if( file_exists($dir) ){
 			$files = scandir($dir);
-			foreach($files as $file){
+			foreach( $files as $file ){
 				if( $file == '.' || $file == '..' ){
 					continue;
 				}
@@ -154,7 +154,7 @@ 
 					continue;
 				}
 				$mtime = filemtime($full_path);
-				$diff = time() - $mtime;
+				$diff = time()-$mtime;
 				if( $diff < 3600 ){
 					continue;
 				}
@@ -177,14 +177,14 @@ 
 			return;
 		}
 
-		$gadgetInfo =& $config['gadgets'][$gadget];
+		$gadgetInfo = & $config['gadgets'][$gadget];
 
-		switch($cmd){
+		switch( $cmd ){
 			case 'enable':
 				unset($gadgetInfo['disabled']);
 			break;
 			case 'disable':
-				$gadgetInfo['disabled']	= true;
+				$gadgetInfo['disabled'] = true;
 			break;
 
 		}
@@ -194,20 +194,20 @@ 
 		}
 
 		$link = $this->GadgetLink($gadget);
-		$this->page->ajaxReplace[] = array('replace','.gadget_link_'.md5($gadget),$link);
+		$this->page->ajaxReplace[] = array('replace', '.gadget_link_'.md5($gadget), $link);
 	}
 
 	function GadgetLink($name){
 		global $config, $langmessage;
-		$info =& $config['gadgets'][$name];
+		$info = & $config['gadgets'][$name];
 		if( !$info ){
 			return '';
 		}
 
 		if( isset($info['disabled']) ){
-			return \gp\tool::Link('Admin/Addons',str_replace('_',' ',$name).' ('.$langmessage['disabled'].')','cmd=enable&addon='.rawurlencode($info['addon']).'&gadget='.rawurlencode($name),'data-cmd="gpajax" class="gadget_link_'.md5($name).'"');
+			return \gp\tool::Link('Admin/Addons', str_replace('_', ' ', $name).' ('.$langmessage['disabled'].')', 'cmd=enable&addon='.rawurlencode($info['addon']).'&gadget='.rawurlencode($name), 'data-cmd="gpajax" class="gadget_link_'.md5($name).'"');
 		}else{
-			return \gp\tool::Link('Admin/Addons',str_replace('_',' ',$name) .' ('.$langmessage['enabled'].')','cmd=disable&addon='.rawurlencode($info['addon']).'&gadget='.rawurlencode($name),'data-cmd="gpajax" class="gadget_link_'.md5($name).'"');
+			return \gp\tool::Link('Admin/Addons', str_replace('_', ' ', $name).' ('.$langmessage['enabled'].')', 'cmd=disable&addon='.rawurlencode($info['addon']).'&gadget='.rawurlencode($name), 'data-cmd="gpajax" class="gadget_link_'.md5($name).'"');
 		}
 
 	}
@@ -218,7 +218,7 @@ 
 	 *
 	 */
 	function GetData(){
-		global $dataDir,$config;
+		global $dataDir, $config;
 
 		//new
 		if( !isset($config['addons']) ){
@@ -238,7 +238,7 @@ 
 		$firstValue = current($config['addons']);
 		if( is_string($firstValue) ){
 
-			foreach($config['addons'] as $addon => $addonName){
+			foreach( $config['addons'] as $addon => $addonName ){
 				$config['addons'][$addon] = array();
 				$config['addons'][$addon]['name'] = $addonName;
 			}
@@ -250,13 +250,13 @@ 
 	 * Prompt User about uninstalling an addon
 	 */
 	function Uninstall(){
-		global $config,$langmessage;
+		global $config, $langmessage;
 
 		echo '<div class="inline_box">';
 		echo '<h3>'.$langmessage['uninstall'].'</h3>';
 		echo '<form action="'.\gp\tool::GetUrl('Admin/Addons').'" method="post">';
 
-		$addon =& $_REQUEST['addon'];
+		$addon = & $_REQUEST['addon'];
 		if( !isset($config['addons'][$addon]) ){
 			echo $langmessage['OOPS'];
 			echo '<p>';
@@ -282,7 +282,7 @@ 
 
 	function Confirm_Uninstall(){
 
-		$addon =& $_POST['addon'];
+		$addon = & $_POST['addon'];
 
 		$installer = new \gp\admin\Addon\Installer();
 		$installer->Uninstall($addon);
@@ -297,7 +297,7 @@ 
 	function ShowAddon($encoded_key){
 		global $config, $langmessage;
 
-		$addon_key	= \gp\admin\Tools::decode64($encoded_key);
+		$addon_key = \gp\admin\Tools::decode64($encoded_key);
 
 		if( !isset($config['addons'][$addon_key]) ){
 			message($langmessage['OOPS'].'(Addon Not Found)');
@@ -327,12 +327,12 @@ 
 		echo '<div id="adminlinks2">';
 
 		$format = array();
-		$format['end']		= '</div></div>';
-		$format['start']	= '<div class="panelgroup"><h3>%s</h3><div class="panelgroup2">';
+		$format['end'] = '</div></div>';
+		$format['start'] = '<div class="panelgroup"><h3>%s</h3><div class="panelgroup2">';
 
-		$this->AddonPanel_Special($addon_key,$format);
-		$this->AddonPanel_Admin($addon_key,$format);
-		$this->AddonPanel_Gadget($addon_key,$format);
+		$this->AddonPanel_Special($addon_key, $format);
+		$this->AddonPanel_Admin($addon_key, $format);
+		$this->AddonPanel_Gadget($addon_key, $format);
 		$this->AddonPanel_Hooks($addon_key, $format);
 		$this->OptionLinks($addon_key, $info, $format);
 
@@ -350,7 +350,7 @@ 
 	function GetAvailAddons(){
 		global $dataDir;
 
-		$addonPath			= $dataDir.'/addons';
+		$addonPath = $dataDir.'/addons';
 
 		if( !file_exists($addonPath) ){
 			message('Warning: The /addons folder "<em>'.$addonPath.'</em>" does not exist on your server.');
@@ -358,29 +358,29 @@ 
 		}
 
 
-		$folders			= \gp\tool\Files::ReadDir($addonPath,1);
-		$versions			= array();
-		$avail				= array();
+		$folders = \gp\tool\Files::ReadDir($addonPath, 1);
+		$versions = array();
+		$avail = array();
 
-		foreach($folders as $value){
-			$fullPath		= $addonPath .'/'.$value;
-			$info			= $this->GetAvailInstall($fullPath);
+		foreach( $folders as $value ){
+			$fullPath = $addonPath.'/'.$value;
+			$info = $this->GetAvailInstall($fullPath);
 
 			if( !$info ){
 				continue;
 			}
 
 
-			$info['source_folder']		= $addonPath .'/'. $value;
-			$info['upgrade_key']		= \gp\admin\Addon\Tools::UpgradePath($info);
-			$avail[$value]				= $info;
+			$info['source_folder'] = $addonPath.'/'.$value;
+			$info['upgrade_key'] = \gp\admin\Addon\Tools::UpgradePath($info);
+			$avail[$value] = $info;
 
 			if( isset($info['Addon_Version']) && isset($info['Addon_Unique_ID']) ){
 
 				$id = $info['Addon_Unique_ID'];
 				if( !isset($versions[$id]) ){
 					$versions[$id] = $info['Addon_Version'];
-				}elseif( version_compare($versions[$id],$info['Addon_Version'],'<') ){
+				}elseif( version_compare($versions[$id], $info['Addon_Version'], '<') ){
 					$versions[$id] = $info['Addon_Version'];
 					continue;
 				}
@@ -407,7 +407,7 @@ 
 	protected function FilterUnique($addons, $versions){
 
 		$temp = array();
-		foreach($addons as $key => $info){
+		foreach( $addons as $key => $info ){
 
 			if( !isset($info['Addon_Version']) || !isset($info['Addon_Unique_ID']) ){
 				$temp[$key] = $info;
@@ -417,7 +417,7 @@ 
 			$id = $info['Addon_Unique_ID'];
 			$version = $info['Addon_Version'];
 
-			if( version_compare($versions[$id], $version,'>') ){
+			if( version_compare($versions[$id], $version, '>') ){
 				continue;
 			}
 
@@ -465,8 +465,8 @@ 
 			echo $langmessage['description'];
 			echo '</th></tr>';
 
-			$i=0;
-			foreach($this->avail_addons as $folder => $info ){
+			$i = 0;
+			foreach( $this->avail_addons as $folder => $info ){
 
 				if( $info['upgrade_key'] ){
 					continue;
@@ -475,17 +475,17 @@ 
 				$info += array('About'=>'');
 
 				echo '<tr class="'.($i % 2 ? 'even' : '').'"><td>';
-				echo str_replace(' ','&nbsp;',$info['Addon_Name']);
+				echo str_replace(' ', '&nbsp;', $info['Addon_Name']);
 				echo '<br/><em class="admin_note">/addons/'.$folder.'</em>';
 				echo '</td><td>';
 				echo $info['Addon_Version'];
 				echo '</td><td>';
-				echo \gp\tool::Link('Admin/Addons',$langmessage['Install'],'cmd=LocalInstall&source='.$folder, array('data-cmd'=>'cnreq'));
+				echo \gp\tool::Link('Admin/Addons', $langmessage['Install'], 'cmd=LocalInstall&source='.$folder, array('data-cmd'=>'cnreq'));
 				echo '</td><td>';
 				echo $info['About'];
 				if( isset($info['Addon_Unique_ID']) && is_numeric($info['Addon_Unique_ID']) ){
 					echo '<br/>';
-					echo $this->DetailLink('plugins', $info['Addon_Unique_ID'],'More Info...');
+					echo $this->DetailLink('plugins', $info['Addon_Unique_ID'], 'More Info...');
 				}
 				echo '</td></tr>';
 				$i++;
@@ -509,8 +509,8 @@ 
 		$show = $this->GetDisplayInfo();
 
 		echo '<div id="adminlinks2">';
-		foreach($show as $addon_key => $info){
-			$this->PluginPanelGroup($addon_key,$info);
+		foreach( $show as $addon_key => $info ){
+			$this->PluginPanelGroup($addon_key, $info);
 		}
 		echo '</div>';
 
@@ -533,7 +533,7 @@ 
 
 
 		//set upgrade_from
-		foreach($this->avail_addons as $folder => $info){
+		foreach( $this->avail_addons as $folder => $info ){
 			if( !$info['upgrade_key'] ){
 				continue;
 			}
@@ -550,8 +550,8 @@ 
 			}
 
 			if( !isset($show[$upgrade_key]['upgrade_version']) || version_compare($show[$upgrade_key]['upgrade_version'], $info['Addon_Version'], '<') ){
-				$show[$upgrade_key]['upgrade_from']		= $folder;
-				$show[$upgrade_key]['upgrade_version']	= $info['Addon_Version'];
+				$show[$upgrade_key]['upgrade_from'] = $folder;
+				$show[$upgrade_key]['upgrade_version'] = $info['Addon_Version'];
 			}
 
 		}
@@ -560,7 +560,7 @@ 
 	}
 
 
-	function PluginPanelGroup($addon_key,$info){
+	function PluginPanelGroup($addon_key, $info){
 		global $langmessage, $gpLayouts;
 
 		$addon_config = \gp\tool\Plugins::GetAddonConfig($addon_key);
@@ -570,7 +570,7 @@ 
 		echo '<div class="panelgroup" id="panelgroup_'.md5($addon_key).'">';
 
 		echo '<h3>';
-		echo \gp\tool::Link('Admin/Addons/'.\gp\admin\Tools::encode64($addon_key),$addon_config['name']);
+		echo \gp\tool::Link('Admin/Addons/'.\gp\admin\Tools::encode64($addon_key), $addon_config['name']);
 		echo '</h3>';
 
 		echo '<div class="panelgroup2">';
@@ -595,7 +595,7 @@ 
 
 		//upgrade local
 		if( isset($addon_config['upgrade_from']) && isset($addon_config['upgrade_version']) ){
-			if(version_compare($addon_config['upgrade_version'],$addon_config['version'] ,'>') ){
+			if( version_compare($addon_config['upgrade_version'], $addon_config['version'], '>') ){
 				echo '<div class="gp_notice">';
 				$label = $langmessage['new_version'].' &nbsp; '.$addon_config['upgrade_version'];
 				echo '<a href="?cmd=LocalInstall&source='.rawurlencode($addon_config['upgrade_from']).'" data-cmd="cnreq">'.$label.'</a>';
@@ -608,7 +608,7 @@ 
 
 			$new_version = \gp\admin\Tools::$new_versions[$addon_config['id']];
 
-			if( version_compare($new_version['version'],$addon_config['version'],'>') ){
+			if( version_compare($new_version['version'], $addon_config['version'], '>') ){
 
 				echo '<div class="gp_notice">';
 				echo '<a href="'.addon_browse_path.'/Plugins?id='.$addon_config['id'].'" data-cmd="remote">';
@@ -628,13 +628,13 @@ 
 	function OptionLinks($addon_key, $addon_config, $format = false){
 		global $langmessage, $gpLayouts;
 
-		$list	= array();
+		$list = array();
 
 		if( !isset($addon_config['is_theme']) || !$addon_config['is_theme'] ){
 
 			//editable text
 			if( isset($addon_config['editable_text']) && \gp\admin\Tools::HasPermission('Admin_Theme_Content') ){
-				$list[] = \gp\tool::Link('Admin_Theme_Content/Text',$langmessage['editable_text'],'cmd=AddonTextForm&addon='.urlencode($addon_key),array('title'=>urlencode($langmessage['editable_text']),'data-cmd'=>'gpabox'));
+				$list[] = \gp\tool::Link('Admin_Theme_Content/Text', $langmessage['editable_text'], 'cmd=AddonTextForm&addon='.urlencode($addon_key), array('title'=>urlencode($langmessage['editable_text']), 'data-cmd'=>'gpabox'));
 			}
 
 			//upgrade link
@@ -643,12 +643,12 @@ 
 			}
 
 			//uninstall
-			$list[] = \gp\tool::Link('Admin/Addons',$langmessage['uninstall'],'cmd=uninstall&addon='.rawurlencode($addon_key),'data-cmd="gpabox"');
+			$list[] = \gp\tool::Link('Admin/Addons', $langmessage['uninstall'], 'cmd=uninstall&addon='.rawurlencode($addon_key), 'data-cmd="gpabox"');
 
 
 			//version
 			if( !empty($addon_config['version']) ){
-				$list[] = '<a>'.$langmessage['Your_version'].' '.$addon_config['version']. '</a>';
+				$list[] = '<a>'.$langmessage['Your_version'].' '.$addon_config['version'].'</a>';
 			}
 
 			//rating
@@ -659,30 +659,30 @@ 
 				if( isset($this->addonReviews[$id]) ){
 					$rating = $this->addonReviews[$id]['rating'];
 				}
-				$label = $langmessage['rate_this_addon'].' '.$this->ShowRating($id,$rating);
-				$list[] = '<span>'.$label. '</span>';
+				$label = $langmessage['rate_this_addon'].' '.$this->ShowRating($id, $rating);
+				$list[] = '<span>'.$label.'</span>';
 			}
 
-			echo $this->FormatList($list,$langmessage['options'],$format);
+			echo $this->FormatList($list, $langmessage['options'], $format);
 			return;
 		}
 
 		//show list of themes using these addons
-		foreach($gpLayouts as $layout_id => $layout_info){
+		foreach( $gpLayouts as $layout_id => $layout_info ){
 			if( !isset($layout_info['addon_key']) || $layout_info['addon_key'] !== $addon_key ){
 				continue;
 			}
 
 			$item = '<span><span class="layout_color_id" style="background:'.$layout_info['color'].'"></span> ';
-			$item .= \gp\tool::Link('Admin_Theme_Content',$layout_info['label']);
+			$item .= \gp\tool::Link('Admin_Theme_Content', $layout_info['label']);
 			$item .= ' ( ';
-			$item .= \gp\tool::Link('Admin_Theme_Content/Edit/'.$layout_id,$langmessage['edit']);
+			$item .= \gp\tool::Link('Admin_Theme_Content/Edit/'.$layout_id, $langmessage['edit']);
 			$item .= ' )</span>';
 
 			$list[] = $item;
 		}
 
-		echo $this->FormatList($list,$langmessage['layouts'],$format);
+		echo $this->FormatList($list, $langmessage['layouts'], $format);
 	}
 
 
@@ -693,7 +693,7 @@ 
 	function LocalInstall(){
 		global $dataDir, $langmessage;
 
-		$_REQUEST				+= array('source'=>'');
+		$_REQUEST += array('source'=>'');
 
 		if( !isset($this->avail_addons[$_REQUEST['source']]) ){
 			message($langmessage['OOPS'].' (Invalid Request)');
@@ -701,8 +701,8 @@ 
 		}
 
 
-		$installer				= new \gp\admin\Addon\Installer();
-		$installer->source		= $this->avail_addons[$_REQUEST['source']]['source_folder'];
+		$installer = new \gp\admin\Addon\Installer();
+		$installer->source = $this->avail_addons[$_REQUEST['source']]['source_folder'];
 
 		$installer->Install();
 		$installer->OutputMessages();

include/admin/Configuration.php

Doc Comments +10 added lines

@@ -384,6 +384,7 @@ 
 	/**
 	 *	Form Functions
 	 *
+	 * @param string $key
 	 */
 	public function formCheckbox($key,$value){
 		$checked = '';
@@ -394,12 +395,18 @@ 
 		echo '<input type="checkbox" name="'.$key.'" value="true" '.$checked.'/> &nbsp;';
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function formInput($name,$value,$type='text'){
 		echo "\n<div>";
 		echo '<input id="'.$name.'" name="'.$name.'" size="50" value="'.htmlspecialchars($value).'" type="'.$type.'" class="gpinput"/>';
 		echo '</div>';
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function formTextarea($name,$value){
 		global $langmessage;
 		$count_label = sprintf($langmessage['_characters'],'<span>'.strlen($value).'</span>');
@@ -409,6 +416,9 @@ 
 		echo '</span>';
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public static function formSelect($name,$possible,$value=null){
 
 		echo '<div>';

Braces +12 added lines, -12 removed lines

@@ -102,16 +102,16 @@ 
 			if( $curr_possible == 'boolean' ){
 				if( isset($_POST[$key]) && ($_POST[$key] == 'true') ){
 					$config[$key] = true;
-				}else{
+				} else{
 					$config[$key] = false;
 				}
 
-			}elseif( $curr_possible == 'integer' ){
+			} elseif( $curr_possible == 'integer' ){
 				if( isset($_POST[$key]) && is_numeric($_POST[$key]) ){
 					$config[$key] = $_POST[$key];
 				}
 
-			}elseif( isset($_POST[$key]) ){
+			} elseif( isset($_POST[$key]) ){
 				$config[$key] = $_POST[$key];
 			}
 		}
@@ -126,7 +126,7 @@ 
 
 		if( isset($_GET['gpreq']) && $_GET['gpreq'] == 'json' ){
 			message($langmessage['SAVED'].' '.$langmessage['REFRESH']);
-		}else{
+		} else{
 			message($langmessage['SAVED']);
 		}
 
@@ -140,7 +140,7 @@ 
 
 		if( $_SERVER['REQUEST_METHOD'] != 'POST'){
 			$show = $config;
-		}else{
+		} else{
 			$show = $_POST;
 		}
 		if( empty($show['recaptcha_language']) ){
@@ -204,7 +204,7 @@ 
 		//tidy
 		if( function_exists('tidy_parse_string') ){
 			$possible['HTML_Tidy'] = array('off'=>$langmessage['Off'],''=>$langmessage['On']);
-		}else{
+		} else{
 			$possible['HTML_Tidy'] = array(''=>'Unavailable');
 		}
 
@@ -294,7 +294,7 @@ 
 				echo '<h2>';
 				if( isset($langmessage[$key]) ){
 					echo $langmessage[$key];
-				}else{
+				} else{
 					echo str_replace('_',' ',$key);
 				}
 				echo '</h2>';
@@ -305,7 +305,7 @@ 
 
 			if( isset($array[$key]) ){
 				$value = $array[$key];
-			}else{
+			} else{
 				$value = '';
 			}
 
@@ -315,7 +315,7 @@ 
 			echo '<tr><td style="white-space:nowrap">';
 			if( isset($langmessage[$key]) ){
 				echo $langmessage[$key];
-			}else{
+			} else{
 				echo str_replace('_',' ',$key);
 			}
 			echo '</td><td>';
@@ -323,7 +323,7 @@ 
 
 			if( is_array($possible_value) ){
 				self::formSelect($key,$possible_value,$value);
-			}else{
+			} else{
 				switch($possible_value){
 					case 'boolean':
 						$this->formCheckbox($key,$value);
@@ -365,7 +365,7 @@ 
 
 		if( isset($_GET['gpreq']) && $_GET['gpreq'] == 'json' ){
 			echo '<input value="'.$langmessage['save'].'" type="submit" name="aaa" accesskey="s" class="gppost gpsubmit" />';
-		}else{
+		} else{
 			echo '<input value="'.$langmessage['save'].'" type="submit" name="aaa" accesskey="s" class="gpsubmit"/>';
 		}
 
@@ -435,7 +435,7 @@ 
 
 			if($key == $current_value){
 				$focus = ' selected="selected" ';
-			}else{
+			} else{
 				$focus = '';
 			}
 			if( isset($languages[$value]) ){

Spacing +56 added lines, -56 removed lines

@@ -19,10 +19,10 @@ 
 
 
 		//add examples to smtp_hosts
-		$langmessage['about_config']['smtp_hosts']		.= 'ssl://smtp.gmail.com:465 ; tls://smtp.live.com:587';
-		$langmessage['about_config']['showgplink']		= 'Showing the "powered by" link on your site is a great way to support '.CMS_NAME.' CMS.';
+		$langmessage['about_config']['smtp_hosts'] .= 'ssl://smtp.gmail.com:465 ; tls://smtp.live.com:587';
+		$langmessage['about_config']['showgplink'] = 'Showing the "powered by" link on your site is a great way to support '.CMS_NAME.' CMS.';
 		$langmessage['about_config']['history_limit']	= 'Max: '.gp_backup_limit;
-		$langmessage['about_config']['maxthumbsize']	.= ' '.\gp\tool::Link('Admin/Configuration','Recreate All Thumbnails','cmd=recreate_thumbs','class="" data-cmd="creq"');
+		$langmessage['about_config']['maxthumbsize']	.= ' '.\gp\tool::Link('Admin/Configuration', 'Recreate All Thumbnails', 'cmd=recreate_thumbs', 'class="" data-cmd="creq"');
 
 
 		$this->variables = array(
@@ -38,7 +38,7 @@ 
 						'desc'					=> 'textarea',
 
 						'Interface'				=> false,
-						'colorbox_style'		=> array('example1'=>'Example 1', 'example2'=>'Example 2', 'example3'=>'Example 3', 'example4'=>'Example 4', 'example5'=>'Example 5' ),
+						'colorbox_style'		=> array('example1'=>'Example 1', 'example2'=>'Example 2', 'example3'=>'Example 3', 'example4'=>'Example 4', 'example5'=>'Example 5'),
 						'language'				=> '',
 						'langeditor'			=> '',
 						'showsitemap'			=> 'boolean',
@@ -56,7 +56,7 @@ 
 						'combinecss'			=> 'boolean',
 						'etag_headers'			=> 'boolean',
 						'resize_images'			=> 'boolean',
-						'space_char'			=> array('_'=>'Undersorce "_"','-'=>'Dash "-"'),
+						'space_char'			=> array('_'=>'Undersorce "_"', '-'=>'Dash "-"'),
 
 
 						/* Contact Configuration */
@@ -86,7 +86,7 @@ 
 	public function RunScript(){
 
 		$cmd = \gp\tool::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 			case 'save_config':
 				$this->SaveConfig();
 			break;
@@ -106,10 +106,10 @@ 
 	protected function SaveConfig(){
 		global $config, $langmessage;
 
-		$config_before	= $config;
-		$possible		= $this->getPossible();
+		$config_before = $config;
+		$possible = $this->getPossible();
 
-		foreach($possible as $key => $curr_possible){
+		foreach( $possible as $key => $curr_possible ){
 
 			if( $curr_possible == 'boolean' ){
 				if( isset($_POST[$key]) && ($_POST[$key] == 'true') ){
@@ -129,7 +129,7 @@ 
 		}
 
 
-		$config['history_limit'] = min($config['history_limit'],gp_backup_limit);
+		$config['history_limit'] = min($config['history_limit'], gp_backup_limit);
 
 		if( !\gp\admin\Tools::SaveConfig(true) ){
 			return false;
@@ -144,7 +144,7 @@ 
 
 		//resize thumbnails
 		if( $config_before['maxthumbsize'] !== $config['maxthumbsize'] ){
-			msg(\gp\tool::Link('Admin/Configuration','Recreate All Thumbnails?','cmd=recreate_thumbs','class="" data-cmd="creq"'));
+			msg(\gp\tool::Link('Admin/Configuration', 'Recreate All Thumbnails?', 'cmd=recreate_thumbs', 'class="" data-cmd="creq"'));
 		}
 
 
@@ -156,7 +156,7 @@ 
 
 		$mailer = new \gp\tool\Emailer();
 
-		if( $_SERVER['REQUEST_METHOD'] != 'POST'){
+		if( $_SERVER['REQUEST_METHOD'] != 'POST' ){
 			$show = $config;
 		}else{
 			$show = $_POST;
@@ -189,13 +189,13 @@ 
 	 *
 	 */
 	protected function getPossible(){
-		global $dataDir,$langmessage;
+		global $dataDir, $langmessage;
 
 		$possible = $this->variables;
 
 		$langDir = $dataDir.'/include/thirdparty/ckeditor_34/lang'; //ckeditor
 
-		$possible['langeditor'] = \gp\tool\Files::readDir($langDir,'js');
+		$possible['langeditor'] = \gp\tool\Files::readDir($langDir, 'js');
 		unset($possible['langeditor']['_languages']);
 		$possible['langeditor']['inherit'] = ' '.$langmessage['default']; //want it to be the first in the list
 		asort($possible['langeditor']);
@@ -221,7 +221,7 @@ 
 
 		//tidy
 		if( function_exists('tidy_parse_string') ){
-			$possible['HTML_Tidy'] = array('off'=>$langmessage['Off'],''=>$langmessage['On']);
+			$possible['HTML_Tidy'] = array('off'=>$langmessage['Off'], ''=>$langmessage['On']);
 		}else{
 			$possible['HTML_Tidy'] = array(''=>'Unavailable');
 		}
@@ -229,36 +229,36 @@ 
 
 
 		//required email fields
-		$possible['require_email'] = array(	'none'		=> 'None',
+		$possible['require_email'] = array('none'		=> 'None',
 											''			=> 'Subject & Message',
-											'email'		=> 'Subject, Message & Email' );
+											'email'		=> 'Subject, Message & Email');
 
 
 		//see xoopsmultimailer.php
-		$possible['mail_method'] = array(	'mail'		=> 'PHP mail()',
+		$possible['mail_method'] = array('mail'		=> 'PHP mail()',
 											'sendmail'	=> 'sendmail',
 											'smtp'		=> 'smtp',
-											'smtpauth'	=> 'SMTPAuth' );
+											'smtpauth'	=> 'SMTPAuth');
 
 		//CDN
-		foreach(\gp\tool\Output\Combine::$scripts as $key => $script_info){
+		foreach( \gp\tool\Output\Combine::$scripts as $key => $script_info ){
 			if( !isset($script_info['cdn']) ){
 				continue;
 			}
 
-			$config_key					= 'cdn_'.$key;
+			$config_key = 'cdn_'.$key;
 
 			if( !array_key_exists($config_key, $possible) ){
 				continue;
 			}
 
-			$opts						= array_keys($script_info['cdn']);
-			$possible[$config_key]		= array_combine($opts, $opts);
-			array_unshift($possible[$config_key],$langmessage['None']);
+			$opts = array_keys($script_info['cdn']);
+			$possible[$config_key] = array_combine($opts, $opts);
+			array_unshift($possible[$config_key], $langmessage['None']);
 		}
 
 
-		gpSettingsOverride('configuration',$possible);
+		gpSettingsOverride('configuration', $possible);
 
 
 		return $possible;
@@ -274,14 +274,14 @@ 
 		global $dataDir;
 		$lang_dir = $dataDir.'/include/languages';
 
-		$files		= scandir($lang_dir);
-		$languages	= array();
-		foreach($files as $file){
-			if( $file == '.' || $file == '..' || strpos($file,'main.inc') === false ){
+		$files = scandir($lang_dir);
+		$languages = array();
+		foreach( $files as $file ){
+			if( $file == '.' || $file == '..' || strpos($file, 'main.inc') === false ){
 				continue;
 			}
 
-			$languages[] = str_replace('.main.inc','',$file);
+			$languages[] = str_replace('.main.inc', '', $file);
 		}
 
 		return array_combine($languages, $languages);
@@ -294,8 +294,8 @@ 
 	protected function showForm(){
 		global $langmessage;
 
-		$possible_values	= $this->getPossible();
-		$array				= $this->getValues();
+		$possible_values = $this->getPossible();
+		$array = $this->getValues();
 
 		echo '<form action="'.\gp\tool::GetUrl($this->page->requested).'" method="post">';
 
@@ -303,7 +303,7 @@ 
 
 		//order by the possible values
 		$opened = false;
-		foreach($possible_values as $key => $possible_value){
+		foreach( $possible_values as $key => $possible_value ){
 
 			if( $possible_value === false ){
 				if( $opened ){
@@ -313,7 +313,7 @@ 
 				if( isset($langmessage[$key]) ){
 					echo $langmessage[$key];
 				}else{
-					echo str_replace('_',' ',$key);
+					echo str_replace('_', ' ', $key);
 				}
 				echo '</h2>';
 				echo '<table class="bordered configuration">';
@@ -334,23 +334,23 @@ 
 			if( isset($langmessage[$key]) ){
 				echo $langmessage[$key];
 			}else{
-				echo str_replace('_',' ',$key);
+				echo str_replace('_', ' ', $key);
 			}
 			echo '</td><td>';
 
 
 			if( is_array($possible_value) ){
-				self::formSelect($key,$possible_value,$value);
+				self::formSelect($key, $possible_value, $value);
 			}else{
-				switch($possible_value){
+				switch( $possible_value ){
 					case 'boolean':
-						$this->formCheckbox($key,$value);
+						$this->formCheckbox($key, $value);
 					break;
 					case 'textarea':
-						$this->formTextarea($key,$value);
+						$this->formTextarea($key, $value);
 					break;
 					default:
-						$this->formInput($key,$value,$possible_value);
+						$this->formInput($key, $value, $possible_value);
 					break;
 				}
 			}
@@ -393,7 +393,7 @@ 
 		echo '<b>';
 		echo $langmessage['see_also'];
 		echo '</b> ';
-		echo \gp\tool::Link('Admin/Preferences',$langmessage['Preferences'],'','data-cmd="gpabox"');
+		echo \gp\tool::Link('Admin/Preferences', $langmessage['Preferences'], '', 'data-cmd="gpabox"');
 		echo '</p>';
 
 	}
@@ -404,7 +404,7 @@ 
 	 *
 	 */
 
-	public function formCheckbox($key,$value){
+	public function formCheckbox($key, $value){
 		$checked = '';
 		if( $value && $value !== 'false' ){
 			$checked = ' checked="checked"';
@@ -413,22 +413,22 @@ 
 		echo '<input type="checkbox" name="'.$key.'" value="true" '.$checked.'/> &nbsp;';
 	}
 
-	public function formInput($name,$value,$type='text'){
+	public function formInput($name, $value, $type = 'text'){
 		echo "\n<div>";
 		echo '<input id="'.$name.'" name="'.$name.'" size="50" value="'.htmlspecialchars($value).'" type="'.$type.'" class="gpinput"/>';
 		echo '</div>';
 	}
 
-	public function formTextarea($name,$value){
+	public function formTextarea($name, $value){
 		global $langmessage;
-		$count_label = sprintf($langmessage['_characters'],'<span>'.strlen($value).'</span>');
+		$count_label = sprintf($langmessage['_characters'], '<span>'.strlen($value).'</span>');
 		echo '<span class="show_character_count gptextarea">';
 		echo '<textarea id="'.$name.'" name="'.$name.'" cols="50" rows="2">'.htmlspecialchars($value).'</textarea>';
 		echo '<span class="character_count">'.$count_label.'</span>';
 		echo '</span>';
 	}
 
-	public static function formSelect($name,$possible,$value=null){
+	public static function formSelect($name, $possible, $value = null){
 
 		echo '<div>';
 		echo "\n".'<select name="'.$name.'" class="gpselect">';
@@ -436,23 +436,23 @@ 
 			echo '<option value="" selected="selected"></option>';
 		}
 
-		self::formOptions($possible,$value);
+		self::formOptions($possible, $value);
 		echo '</select>';
 		echo '</div>';
 	}
 
-	public static function formOptions($array,$current_value){
+	public static function formOptions($array, $current_value){
 		global $languages;
 
-		foreach($array as $key => $value){
+		foreach( $array as $key => $value ){
 			if( is_array($value) ){
 				echo '<optgroup label="'.$value.'">';
-				self::formOptions($value,$current_value);
+				self::formOptions($value, $current_value);
 				echo '</optgroup>';
 				continue;
 			}
 
-			if($key == $current_value){
+			if( $key == $current_value ){
 				$focus = ' selected="selected" ';
 			}else{
 				$focus = '';
@@ -474,17 +474,17 @@ 
 	function RecreateThumbs($dir_rel = ''){
 		global $dataDir;
 
-		$dir_full	= $dataDir.'/data/_uploaded'.$dir_rel;
-		$files		= scandir($dir_full);
+		$dir_full = $dataDir.'/data/_uploaded'.$dir_rel;
+		$files = scandir($dir_full);
 
-		foreach($files as $file){
+		foreach( $files as $file ){
 
 			if( $file == '.' || $file == '..' || $file == 'thumbnails' ){
 				continue;
 			}
 
-			$file_full	= $dir_full.'/'.$file;
-			$file_rel	= $dir_rel.'/'.$file;
+			$file_full = $dir_full.'/'.$file;
+			$file_rel = $dir_rel.'/'.$file;
 
 			if( is_dir($file_full) ){
 				$this->RecreateThumbs($file_rel);

include/admin/Content/Trash.php

Doc Comments +2 added lines

@@ -366,6 +366,8 @@
 	 *  - resized images
 	 *  - \gp\special\Galleries::UpdateGalleryInfo($title,$content)
 	 *
+	 * @param string $title
+	 * @param string $file
 	 */
 	public static function RestoreFile($title,$file,$title_info){
 

Braces +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
 
 			if( strpos($file,'/') ){
 				$existing[] = dirname($file);
-			}else{
+			} else{
 				$existing[] = $file;
 			}
 		}
@@ -118,7 +118,7 @@ 
 			if( \gp\tool\Files::Exists($info_file) ){
 				$info					= \gp\tool\Files::Get($info_file,'deleted');
 				$info['page_file']		= $dataDir.'/data/_pages/'.$file.'/page.php';
-			}else{
+			} else{
 				$info['page_file']		= $dataDir.'/data/_pages/'.$file;
 				$info['time']			= filemtime($info['page_file']);
 				$info['orphaned']		= true;
@@ -329,7 +329,7 @@ 
 			if( isset($title_info['index']) ){
 				$index					= $title_info['index'];
 				$gp_index[$new_title]	= $index;
-			}else{
+			} else{
 				$index					= \gp\tool::NewFileIndex();
 				$gp_index[$new_title]	= $index;
 			}
@@ -459,7 +459,7 @@ 
 		foreach($this->trash_files as $trash_index => $info){
 			if( isset($info['orphaned']) ){
 				$orphaned[$trash_index] = $info;
-			}else{
+			} else{
 				$this->TrashRow($trash_index, $info);
 			}
 		}
@@ -528,7 +528,7 @@ 
 
 		if( \gp\admin\Tools::CheckPostedNewPage($info['title'], $msg) ){
 			echo \gp\tool::Link('Admin/Trash',$langmessage['restore'],'cmd=RestoreDeleted&titles[]='.rawurlencode($trash_index),array('data-cmd'=>'postlink'));
-		}else{
+		} else{
 			echo '<span>'.$langmessage['restore'].'</span>';
 		}
 		echo ' &nbsp; ';
@@ -631,7 +631,7 @@ 
 
 		if( $file_sections ){
 			echo \gp\tool\Output\Sections::Render($file_sections,$title_info['title']);
-		}else{
+		} else{
 			echo '<p>This page no longer has any content</p>';
 		}
 	}

Spacing +97 added lines, -97 removed lines

@@ -14,11 +14,11 @@ 
 
 		parent::__construct($args);
 
-		$this->page->head_js[]	= '/include/js/admin/trash.js';
-		$this->trash_files		= self::TrashFiles();
+		$this->page->head_js[] = '/include/js/admin/trash.js';
+		$this->trash_files = self::TrashFiles();
 
 		$cmd = \gp\tool::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 
 			case 'RestoreDeleted':
 				$this->RestoreDeleted();
@@ -30,7 +30,7 @@ 
 		}
 
 		//view a trash file
-		$parts = explode('/',$this->page->requested);
+		$parts = explode('/', $this->page->requested);
 		if( count($parts) > 2 ){
 			$title = $parts[2];
 			if( isset($this->trash_files[$title]) ){
@@ -50,15 +50,15 @@ 
 	 * Delete files in $remove_from_trash
 	 *
 	 */
-	public static function ModTrashData($add_to_trash,$remove_from_trash){
+	public static function ModTrashData($add_to_trash, $remove_from_trash){
 
 		$trash_titles = self::TrashFiles();
 
-		foreach((array)$remove_from_trash as $title_index => $info){
+		foreach( (array)$remove_from_trash as $title_index => $info ){
 			unset($trash_titles[$title_index]);
 
 			//only delete the files if they're in the trash directory
-			if( strpos($info['rm_path'],'/data/_trash') !== false ){
+			if( strpos($info['rm_path'], '/data/_trash') !== false ){
 				\gp\tool\Files::RmAll($info['rm_path']);
 			}
 		}
@@ -75,20 +75,20 @@ 
 	public static function TrashFiles(){
 		global $dataDir, $gp_index, $config;
 
-		$trash_titles 	= array();
+		$trash_titles = array();
 
 		// pre 4.6, deleted page info was stored
 		$trash_file = $dataDir.'/data/_site/trash.php';
 		if( \gp\tool\Files::Exists($trash_file) ){
-			$trash_titles = \gp\tool\Files::Get($trash_file,'trash_titles');
+			$trash_titles = \gp\tool\Files::Get($trash_file, 'trash_titles');
 		}
 
 
 		// get files associated existing titles
-		$pages_dir		= $dataDir.'/data/_pages/';
-		$pages_dir_len	= strlen($pages_dir);
-		$existing		= array();
-		foreach($gp_index as $title => $index){
+		$pages_dir = $dataDir.'/data/_pages/';
+		$pages_dir_len = strlen($pages_dir);
+		$existing = array();
+		foreach( $gp_index as $title => $index ){
 
 			if( \gp\tool::SpecialOrAdmin($title) !== false ){
 				continue;
@@ -96,9 +96,9 @@ 
 
 
 			$file = \gp\tool\Files::PageFile($title);
-			$file = substr($file,$pages_dir_len);
+			$file = substr($file, $pages_dir_len);
 
-			if( strpos($file,'/') ){
+			if( strpos($file, '/') ){
 				$existing[] = dirname($file);
 			}else{
 				$existing[] = $file;
@@ -108,49 +108,49 @@ 
 
 		// post 4.6, deleted pages are left in the data/_pages folder
 		$files			= scandir($pages_dir);
-		$files			= array_diff($files, array('.','..','index.html'));
+		$files			= array_diff($files, array('.', '..', 'index.html'));
 
 
 		// add the new files to the list of $trash_titles
-		$new_trash_files	= array_diff($files,$existing);
-		$page_prefix		= substr($config['gpuniq'],0,7).'_';
-		foreach($new_trash_files as $file){
+		$new_trash_files = array_diff($files, $existing);
+		$page_prefix = substr($config['gpuniq'], 0, 7).'_';
+		foreach( $new_trash_files as $file ){
 
 			$info						= array();
-			$info_file					= $dataDir.'/data/_pages/'.$file.'/deleted.php';
+			$info_file = $dataDir.'/data/_pages/'.$file.'/deleted.php';
 			if( \gp\tool\Files::Exists($info_file) ){
-				$info					= \gp\tool\Files::Get($info_file,'deleted');
+				$info					= \gp\tool\Files::Get($info_file, 'deleted');
 				$info['page_file']		= $dataDir.'/data/_pages/'.$file.'/page.php';
 			}else{
 				$info['page_file']		= $dataDir.'/data/_pages/'.$file;
-				$info['time']			= filemtime($info['page_file']);
-				$info['orphaned']		= true;
+				$info['time'] = filemtime($info['page_file']);
+				$info['orphaned'] = true;
 			}
 
 			//get index
-			if( strpos($file,$page_prefix) === 0 ){
-				$info['index'] 			= substr($file,8); // remove page_prefix
+			if( strpos($file, $page_prefix) === 0 ){
+				$info['index'] 			= substr($file, 8); // remove page_prefix
 			}
 
 			$info['rm_path']			= $dataDir.'/data/_pages/'.$file;
-			$trash_titles[$file]		= $info;
+			$trash_titles[$file] = $info;
 		}
 
 		//make sure we have a title
-		foreach($trash_titles as $trash_index => &$info){
+		foreach( $trash_titles as $trash_index => &$info ){
 			if( !isset($info['title']) ){
-				$info['title'] = str_replace('_',' ',$trash_index);
+				$info['title'] = str_replace('_', ' ', $trash_index);
 			}
 		}
 
-		uasort($trash_titles,array('self','TitleSort'));
+		uasort($trash_titles, array('self', 'TitleSort'));
 
 		return $trash_titles;
 	}
 
 
-	public static function TitleSort($a,$b){
-		return strnatcasecmp($a['title'],$b['title']);
+	public static function TitleSort($a, $b){
+		return strnatcasecmp($a['title'], $b['title']);
 	}
 
 
@@ -161,7 +161,7 @@ 
 	public static function SaveTrashTitles($trash_titles){
 		global $dataDir;
 		$index_file = $dataDir.'/data/_site/trash.php';
-		return \gp\tool\Files::SaveData($index_file,'trash_titles',$trash_titles);
+		return \gp\tool\Files::SaveData($index_file, 'trash_titles', $trash_titles);
 	}
 
 
@@ -179,33 +179,33 @@ 
 			$trash_titles = self::TrashFiles();
 		}
 
-		if( !array_key_exists($trash_index,$trash_titles) ){
+		if( !array_key_exists($trash_index, $trash_titles) ){
 			return false;
 		}
 
-		$title_info			= $trash_titles[$trash_index];
+		$title_info = $trash_titles[$trash_index];
 
 
 		//make sure we have a file or dir
 		if( empty($title_info['rm_path']) ){
 
 			if( empty($title_info['file']) ){
-				$title_info['file']			= $trash_index.'.php';
+				$title_info['file'] = $trash_index.'.php';
 			}
-			$title_info['rm_path']			= $dataDir.'/data/_trash/'.$title_info['file'];
-			$title_info['page_file']		= $dataDir.'/data/_trash/'.$title_info['file'];
+			$title_info['rm_path'] = $dataDir.'/data/_trash/'.$title_info['file'];
+			$title_info['page_file'] = $dataDir.'/data/_trash/'.$title_info['file'];
 		}
 
 
 
 		//make sure we have a label
 		if( empty($title_info['label']) ){
-			$title_info['label']	= \gp\admin\Tools::LabelToSlug($trash_index);
+			$title_info['label'] = \gp\admin\Tools::LabelToSlug($trash_index);
 		}
 
 		//make sure we have a file_type
 		if( empty($title_info['type']) ){
-			$title_info['type']		= self::GetTypes($title_info['page_file']);
+			$title_info['type'] = self::GetTypes($title_info['page_file']);
 		}
 
 
@@ -226,15 +226,15 @@ 
 		$source_file			= \gp\tool\Files::PageFile($title);
 		$source_dir				= dirname($source_file);
 		$trash_file				= $source_dir.'/deleted.php';
-		$file_sections			= \gp\tool\Files::Get($source_file,'file_sections');
+		$file_sections = \gp\tool\Files::Get($source_file, 'file_sections');
 
 
 		//create trash info file
-		$trash_info				= $gp_titles[$index];
+		$trash_info = $gp_titles[$index];
 		$trash_info['title']	= $title;
 		$trash_info['time']		= time();
 
-		if( !\gp\tool\Files::SaveData($trash_file,'deleted',$trash_info) ){
+		if( !\gp\tool\Files::SaveData($trash_file, 'deleted', $trash_info) ){
 			return false;
 		}
 
@@ -243,9 +243,9 @@ 
 		if( count($file_sections) ){
 			includeFile('image.php');
 			\gp_resized::SetIndex();
-			foreach($file_sections as $section_data){
+			foreach( $file_sections as $section_data ){
 				if( isset($section_data['resized_imgs']) ){
-					\gp\tool\Editing::ResizedImageUse($section_data['resized_imgs'],array());
+					\gp\tool\Editing::ResizedImageUse($section_data['resized_imgs'], array());
 				}
 			}
 		}
@@ -259,7 +259,7 @@ 
 	 *
 	 */
 	public function RestoreDeleted(){
-		global $langmessage,$gp_titles,$gp_index;
+		global $langmessage, $gp_titles, $gp_index;
 
 		if( empty($_POST['titles']) || !is_array($_POST['titles']) ){
 			message($langmessage['OOPS'].' (No Titles)');
@@ -278,17 +278,17 @@ 
 			return false;
 		}
 
-		self::ModTrashData(null,$titles);
+		self::ModTrashData(null, $titles);
 
 		$show_titles = array();
-		foreach($titles as $trash_index => $info){
-			$show_titles[] = \gp\tool::Link($info['title'],$info['title']);
+		foreach( $titles as $trash_index => $info ){
+			$show_titles[] = \gp\tool::Link($info['title'], $info['title']);
 			unset($this->trash_files[$trash_index]);
 		}
-		$title_string = implode(', ',$show_titles);
+		$title_string = implode(', ', $show_titles);
 
-		$link		= \gp\tool::GetUrl('Admin/Menu');
-		$message	= sprintf($langmessage['file_restored'],$title_string,$link);
+		$link = \gp\tool::GetUrl('Admin/Menu');
+		$message = sprintf($langmessage['file_restored'], $title_string, $link);
 
 		message($message);
 	}
@@ -306,7 +306,7 @@ 
 
 		$new_menu		= array();
 		$restored		= array();
-		foreach($titles as $trash_index){
+		foreach( $titles as $trash_index ){
 
 			//get trash info about file
 			$title_info = self::GetInfo($trash_index);
@@ -314,7 +314,7 @@ 
 				continue;
 			}
 
-			$new_title = \gp\admin\Tools::CheckPostedNewPage($title_info['title'],$message);
+			$new_title = \gp\admin\Tools::CheckPostedNewPage($title_info['title'], $message);
 			if( empty($new_title) ){
 				continue;
 			}
@@ -339,7 +339,7 @@ 
 			// move the trash file to the /_pages directory if needed
 			$new_file = \gp\tool\Files::PageFile($new_title);
 			if( !\gp\tool\Files::Exists($new_file) ){
-				if( !\gp\tool\Files::Rename($title_info['page_file'],$new_file) ){
+				if( !\gp\tool\Files::Rename($title_info['page_file'], $new_file) ){
 					unset($gp_index[$new_title]);
 					continue;
 				}
@@ -347,12 +347,12 @@ 
 
 
 			//add to $gp_titles
-			$gp_titles[$index]				= array();
-			$gp_titles[$index]['label']		= $title_info['label'];
-			$gp_titles[$index]['type']		= $title_info['type'];
+			$gp_titles[$index] = array();
+			$gp_titles[$index]['label'] = $title_info['label'];
+			$gp_titles[$index]['type'] = $title_info['type'];
 
-			$new_menu[$index]				= array();
-			$restored[$trash_index]			= $title_info;
+			$new_menu[$index] = array();
+			$restored[$trash_index] = $title_info;
 
 			self::RestoreFile($new_title, $new_file, $title_info);
 		}
@@ -368,39 +368,39 @@ 
 	 *  - \gp\special\Galleries::UpdateGalleryInfo($title,$content)
 	 *
 	 */
-	public static function RestoreFile($title,$file,$title_info){
+	public static function RestoreFile($title, $file, $title_info){
 
-		$file_sections = \gp\tool\Files::Get($file,'file_sections');
+		$file_sections = \gp\tool\Files::Get($file, 'file_sections');
 
 		// Restore resized images
 		if( count($file_sections) ){
 			includeFile('image.php');
 			\gp_resized::SetIndex();
-			foreach($file_sections as $section => $section_data){
+			foreach( $file_sections as $section => $section_data ){
 
 				if( !isset($section_data['resized_imgs']) ){
 					continue;
 				}
 
-				foreach($section_data['resized_imgs'] as $image_index => $sizes){
+				foreach( $section_data['resized_imgs'] as $image_index => $sizes ){
 					if( !isset(\gp_resized::$index[$image_index]) ){
 						continue;
 					}
 					$img = \gp_resized::$index[$image_index];
-					foreach($sizes as $size){
-						list($width,$height) = explode('x',$size);
-						\gp\tool\Editing::CreateImage($img,$width,$height);
+					foreach( $sizes as $size ){
+						list($width, $height) = explode('x', $size);
+						\gp\tool\Editing::CreateImage($img, $width, $height);
 					}
 				}
-				\gp\tool\Editing::ResizedImageUse(array(),$section_data['resized_imgs']);
+				\gp\tool\Editing::ResizedImageUse(array(), $section_data['resized_imgs']);
 			}
 			\gp_resized::SaveIndex();
 		}
 
 
 		// Restore Galleries
-		if( strpos($title_info['type'],'gallery') !== false ){
-			\gp\special\Galleries::UpdateGalleryInfo($title,$file_sections);
+		if( strpos($title_info['type'], 'gallery') !== false ){
+			\gp\special\Galleries::UpdateGalleryInfo($title, $file_sections);
 		}
 	}
 
@@ -413,14 +413,14 @@ 
 	 */
 	public static function GetTypes($file){
 
-		$types			= array();
-		$file_sections	= \gp\tool\Files::Get($file,'file_sections');
+		$types = array();
+		$file_sections = \gp\tool\Files::Get($file, 'file_sections');
 
-		foreach($file_sections as $section){
+		foreach( $file_sections as $section ){
 			$types[] = $section['type'];
 		}
 		$types = array_unique($types);
-		return implode(',',$types);
+		return implode(',', $types);
 	}
 
 
@@ -429,9 +429,9 @@ 
 	 *
 	 */
 	public function Trash(){
-		global $dataDir,$langmessage;
+		global $dataDir, $langmessage;
 
-		$this->section_types			= \gp\tool\Output\Sections::GetTypes();
+		$this->section_types = \gp\tool\Output\Sections::GetTypes();
 
 		echo '<h2>'.$langmessage['trash'].'</h2>';
 
@@ -457,7 +457,7 @@ 
 
 		// non-orphaned
 		$orphaned = array();
-		foreach($this->trash_files as $trash_index => $info){
+		foreach( $this->trash_files as $trash_index => $info ){
 			if( isset($info['orphaned']) ){
 				$orphaned[$trash_index] = $info;
 			}else{
@@ -475,10 +475,10 @@ 
 			$q = array();
 			$q['titles'] = array_keys($orphaned);
 			$q = 'cmd=DeleteFromTrash&'.http_build_query($q);
-			echo \gp\tool::Link('Admin/Trash',$langmessage['delete'],$q,array('data-cmd'=>'postlink'));
+			echo \gp\tool::Link('Admin/Trash', $langmessage['delete'], $q, array('data-cmd'=>'postlink'));
 			echo '</td></tr>';
 
-			foreach($orphaned as $trash_index => $info){
+			foreach( $orphaned as $trash_index => $info ){
 				$this->TrashRow($trash_index, $info);
 			}
 		}
@@ -491,7 +491,7 @@ 
 		echo '</form>';
 	}
 
-	public function TrashRow($trash_index, $info, $show_orphaned = false ){
+	public function TrashRow($trash_index, $info, $show_orphaned = false){
 		global $langmessage;
 
 		$class = '';
@@ -509,15 +509,15 @@ 
 			echo '(Orphaned) &nbsp; ';
 		}
 
-		echo \gp\tool::Link('Admin/Trash/'.$trash_index,str_replace('_',' ',$info['title']));
+		echo \gp\tool::Link('Admin/Trash/'.$trash_index, str_replace('_', ' ', $info['title']));
 		echo '</label>';
 
 		//time
 		echo '</td><td>';
 
 		if( !empty($info['time']) ){
-			$elapsed = \gp\admin\Tools::Elapsed(time() - $info['time']);
-			echo sprintf($langmessage['_ago'],$elapsed);
+			$elapsed = \gp\admin\Tools::Elapsed(time()-$info['time']);
+			echo sprintf($langmessage['_ago'], $elapsed);
 		}
 
 		echo '</td><td>';
@@ -528,12 +528,12 @@ 
 		echo '</td><td>';
 
 		if( \gp\admin\Tools::CheckPostedNewPage($info['title'], $msg) ){
-			echo \gp\tool::Link('Admin/Trash',$langmessage['restore'],'cmd=RestoreDeleted&titles[]='.rawurlencode($trash_index),array('data-cmd'=>'postlink'));
+			echo \gp\tool::Link('Admin/Trash', $langmessage['restore'], 'cmd=RestoreDeleted&titles[]='.rawurlencode($trash_index), array('data-cmd'=>'postlink'));
 		}else{
 			echo '<span>'.$langmessage['restore'].'</span>';
 		}
 		echo ' &nbsp; ';
-		echo \gp\tool::Link('Admin/Trash',$langmessage['delete'],'cmd=DeleteFromTrash&titles[]='.rawurlencode($trash_index),array('data-cmd'=>'postlink'));
+		echo \gp\tool::Link('Admin/Trash', $langmessage['delete'], 'cmd=DeleteFromTrash&titles[]='.rawurlencode($trash_index), array('data-cmd'=>'postlink'));
 
 		echo '</td></tr>';
 	}
@@ -545,17 +545,17 @@ 
 	public function TitleTypes($types){
 		global $gp_titles;
 
-		$types		= explode(',',$types);
+		$types		= explode(',', $types);
 		$types		= array_filter($types);
 		$types		= array_unique($types);
 
-		foreach($types as $i => $type){
+		foreach( $types as $i => $type ){
 			if( isset($this->section_types[$type]) && isset($this->section_types[$type]['label']) ){
 				$types[$i] = $this->section_types[$type]['label'];
 			}
 		}
 
-		echo implode(', ',$types);
+		echo implode(', ', $types);
 	}
 
 	/**
@@ -563,17 +563,17 @@ 
 	 *
 	 */
 	public function DeleteFromTrash(){
-		global $dataDir,$langmessage;
+		global $dataDir, $langmessage;
 
 		if( empty($_POST['titles']) || !is_array($_POST['titles']) ){
 			message($langmessage['OOPS'].' (No Titles)');
 			return;
 		}
 
-		$titles			= array();
+		$titles = array();
 		$incomplete		= false;
 
-		foreach($_POST['titles'] as $trash_index){
+		foreach( $_POST['titles'] as $trash_index ){
 			$title_info = self::GetInfo($trash_index);
 
 			if( $title_info === false ){
@@ -583,13 +583,13 @@ 
 			$titles[$trash_index] = $title_info;
 		}
 
-		if( !self::ModTrashData(null,$titles) ){
+		if( !self::ModTrashData(null, $titles) ){
 			return false;
 		}
 
 
 		//remove the data
-		foreach($titles as $trash_index => $info){
+		foreach( $titles as $trash_index => $info ){
 			\gp\tool\Files::RmAll($info['rm_path']);
 			unset($this->trash_files[$trash_index]);
 		}
@@ -613,14 +613,14 @@ 
 
 		//delete / restore links
 		echo '<div class="pull-right">';
-		echo \gp\tool::Link('Admin/Trash',$langmessage['restore'],'cmd=RestoreDeleted&titles[]='.rawurlencode($trash_index),array('data-cmd'=>'cnreq','class'=>'gpsubmit'));
+		echo \gp\tool::Link('Admin/Trash', $langmessage['restore'], 'cmd=RestoreDeleted&titles[]='.rawurlencode($trash_index), array('data-cmd'=>'cnreq', 'class'=>'gpsubmit'));
 		echo ' &nbsp; ';
-		echo \gp\tool::Link('Admin/Trash',$langmessage['delete'],'cmd=DeleteFromTrash&titles[]='.rawurlencode($trash_index),array('data-cmd'=>'cnreq','class'=>'gpsubmit'));
+		echo \gp\tool::Link('Admin/Trash', $langmessage['delete'], 'cmd=DeleteFromTrash&titles[]='.rawurlencode($trash_index), array('data-cmd'=>'cnreq', 'class'=>'gpsubmit'));
 		echo '</div>';
 
 
 		echo '<h2 class="hmargin">';
-		echo \gp\tool::Link('Admin/Trash',$langmessage['trash']);
+		echo \gp\tool::Link('Admin/Trash', $langmessage['trash']);
 		echo ' &#187; ';
 		echo htmlspecialchars($title_info['title']);
 		echo '</h2>';
@@ -628,10 +628,10 @@ 
 
 
 		//get file sections
-		$file_sections		= \gp\tool\Files::Get($title_info['page_file'],'file_sections');
+		$file_sections = \gp\tool\Files::Get($title_info['page_file'], 'file_sections');
 
 		if( $file_sections ){
-			echo \gp\tool\Output\Sections::Render($file_sections,$title_info['title']);
+			echo \gp\tool\Output\Sections::Render($file_sections, $title_info['title']);
 		}else{
 			echo '<p>This page no longer has any content</p>';
 		}

include/admin/Login.php

Doc Comments +3 added lines

@@ -184,6 +184,9 @@
 	}
 
 
+	/**
+	 * @param string $name
+	 */
 	public function Checked($name){
 
 		if( strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST' )

Spacing +27 added lines, -27 removed lines

@@ -12,13 +12,13 @@ 
 
 		\gp\tool::LoadComponents('gp-admin-css');
 
-		$this->requested		= str_replace(' ','_',$title);
-		$this->title			= $title;
-		$this->get_theme_css 	= false;
-		$_REQUEST['gpreq']		= 'admin';
+		$this->requested = str_replace(' ', '_', $title);
+		$this->title = $title;
+		$this->get_theme_css = false;
+		$_REQUEST['gpreq'] = 'admin';
 
 		$this->head .= "\n".'<meta name="robots" content="noindex,nofollow" />';
-		@header( 'X-Frame-Options: SAMEORIGIN' );
+		@header('X-Frame-Options: SAMEORIGIN');
 	}
 
 	public function RunScript(){}
@@ -26,7 +26,7 @@ 
 	public function GetGpxContent(){
 
 
-		$this->head		.= "\n<script type=\"text/javascript\">var IE_LT_10 = false;</script><!--[if lt IE 10]>\n<script type=\"text/javascript\">IE_LT_10=true;</script>\n<![endif]-->";
+		$this->head .= "\n<script type=\"text/javascript\">var IE_LT_10 = false;</script><!--[if lt IE 10]>\n<script type=\"text/javascript\">IE_LT_10=true;</script>\n<![endif]-->";
 		$this->head_js[] = '/include/js/login.js';
 		$this->head_js[] = '/include/js/md5_sha.js';
 		$this->head_js[] = '/include/thirdparty/js/jsSHA.js';
@@ -35,7 +35,7 @@ 
 		$_POST += array('username'=>'');
 
 		$this->admin_js = true;
-		\gp\tool\Session::cookie('g',2);
+		\gp\tool\Session::cookie('g', 2);
 
 
 
@@ -46,7 +46,7 @@ 
 		echo '<table><tr><td>';
 
 		$cmd = \gp\tool::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 			case 'send_password';
 				if( $this->SendPassword() ){
 					$this->LoginForm();
@@ -84,7 +84,7 @@ 
 
 		echo '<input type="hidden" name="cmd" value="send_password" />';
 		echo '<input type="submit" name="aa" value="'.$langmessage['send_password'].'" class="login_submit" />';
-		echo ' &nbsp; <label>'. \gp\tool::Link('Admin',$langmessage['back']).'</label>';
+		echo ' &nbsp; <label>'.\gp\tool::Link('Admin', $langmessage['back']).'</label>';
 
 		echo '</form>';
 		echo '</div>';
@@ -100,14 +100,14 @@ 
 
 
 		echo '<div id="loginform">';
-			echo '<div id="login_timeout" class="nodisplay">Log in Timeout: '.\gp\tool::Link('Admin','Reload to continue...').'</div>';
+			echo '<div id="login_timeout" class="nodisplay">Log in Timeout: '.\gp\tool::Link('Admin', 'Reload to continue...').'</div>';
 
 			echo '<form action="'.\gp\tool::GetUrl('Admin').'" method="post" id="login_form">';
-			echo '<input type="hidden" name="file" value="'.htmlspecialchars($_REQUEST['file']).'">';	//for redirection
+			echo '<input type="hidden" name="file" value="'.htmlspecialchars($_REQUEST['file']).'">'; //for redirection
 
 			echo '<div>';
 			echo '<input type="hidden" name="cmd" value="login" />';
-			echo '<input type="hidden" name="login_nonce" value="'.htmlspecialchars(\gp\tool::new_nonce('login_nonce',true,300)).'" />';
+			echo '<input type="hidden" name="login_nonce" value="'.htmlspecialchars(\gp\tool::new_nonce('login_nonce', true, 300)).'" />';
 			echo '</div>';
 
 			echo '<p class="login_text">';
@@ -125,7 +125,7 @@ 
 			echo '<p>';
 			echo '<input type="submit" class="login_submit" value="'.$langmessage['login'].'" />';
 			echo ' &nbsp; ';
-			echo \gp\tool::Link('',$langmessage['cancel']);
+			echo \gp\tool::Link('', $langmessage['cancel']);
 			echo '</p>';
 
 			echo '<p>';
@@ -142,8 +142,8 @@ 
 
 			echo '<div>';
 			echo '<label>';
-			$url = \gp\tool::GetUrl('Admin','cmd=forgotten');
-			echo sprintf($langmessage['forgotten_password'],$url);
+			$url = \gp\tool::GetUrl('Admin', 'cmd=forgotten');
+			echo sprintf($langmessage['forgotten_password'], $url);
 			echo '</label>';
 			echo '</div>';
 
@@ -199,8 +199,8 @@ 
 	public function SendPassword(){
 		global $langmessage, $config;
 
-		$users		= \gp\tool\Files::Get('_site/users');
-		$username	= $_POST['username'];
+		$users = \gp\tool\Files::Get('_site/users');
+		$username = $_POST['username'];
 
 		if( !isset($users[$username]) ){
 			message($langmessage['OOPS']);
@@ -216,29 +216,29 @@ 
 			return false;
 		}
 
-		$passwordChars	= str_repeat('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',3);
+		$passwordChars = str_repeat('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', 3);
 		$newpass		= str_shuffle($passwordChars);
-		$newpass		= substr($newpass,0,8);
-		$pass_hash		= \gp\tool\Session::PassAlgo($userinfo);
+		$newpass		= substr($newpass, 0, 8);
+		$pass_hash = \gp\tool\Session::PassAlgo($userinfo);
 
-		$users[$username]['newpass'] = \gp\tool::hash($newpass,$pass_hash);
-		if( !\gp\tool\Files::SaveData('_site/users','users',$users) ){
+		$users[$username]['newpass'] = \gp\tool::hash($newpass, $pass_hash);
+		if( !\gp\tool\Files::SaveData('_site/users', 'users', $users) ){
 			message($langmessage['OOPS']);
 			return false;
 		}
 
 		$server		= \gp\tool::ServerName();
-		$link		= \gp\tool::AbsoluteLink('Admin',$langmessage['login']);
-		$message	= sprintf($langmessage['passwordremindertext'],$server,$link,$username,$newpass);
+		$link = \gp\tool::AbsoluteLink('Admin', $langmessage['login']);
+		$message	= sprintf($langmessage['passwordremindertext'], $server, $link, $username, $newpass);
 
 
 		//send email
 		$mailer = new \gp\tool\Emailer();
 
 		if( $mailer->SendEmail($userinfo['email'], $langmessage['new_password'], $message) ){
-			list($namepart,$sitepart) = explode('@',$userinfo['email']);
-			$showemail = substr($namepart,0,3).'...@'.$sitepart;
-			message(sprintf($langmessage['password_sent'],$username,$showemail));
+			list($namepart, $sitepart) = explode('@', $userinfo['email']);
+			$showemail = substr($namepart, 0, 3).'...@'.$sitepart;
+			message(sprintf($langmessage['password_sent'], $username, $showemail));
 			return true;
 		}
 

Braces +7 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 			case 'send_password';
 				if( $this->SendPassword() ){
 					$this->LoginForm();
-				}else{
+				} else{
 					$this->FogottenPassword();
 				}
 			break;
@@ -186,11 +186,13 @@ 
 
 	public function Checked($name){
 
-		if( strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST' )
-			return ' checked="checked" ';
+		if( strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST' ){
+					return ' checked="checked" ';
+		}
 
-		if( !isset($_POST[$name]) )
-			return '';
+		if( !isset($_POST[$name]) ){
+					return '';
+		}
 
 		return ' checked="checked" ';
 	}

include/admin/Menu/Ajax.php

Doc Comments +2 added lines

@@ -171,6 +171,7 @@ 
 	/**
 	 * Message or redirect when file is saved
 	 *
+	 * @param string $new_index
 	 */
 	public function HiddenSaved($new_index){
 		global $langmessage, $page;
@@ -565,6 +566,7 @@ 
 	/**
 	 * Form for adding external link
 	 *
+	 * @param string $cmd
 	 */
 	public function ExternalForm($cmd,$submit,$args){
 		global $langmessage;

Braces +5 added lines, -5 removed lines

@@ -182,7 +182,7 @@ 
 			$url	= \gp\tool::AbsoluteUrl($title,'',true,false);
 			msg(sprintf($langmessage['will_redirect'],\gp\tool::Link_Page($title)));
 			$page->ajaxReplace[] = array('location',$url,15000);
-		}else{
+		} else{
 			msg($langmessage['SAVED']);
 		}
 	}
@@ -259,7 +259,7 @@ 
 
 			if( isset($_POST['insert_how']) ){
 				$this->InsertDialog($_POST['insert_how']);
-			}else{
+			} else{
 				$this->AddHidden();
 			}
 
@@ -468,7 +468,7 @@ 
 			echo '<span class="slug">';
 			if( isset($info['title']) ){
 				echo '/'.$info['title'];
-			}else{
+			} else{
 				echo '/'.$title;
 			}
 			echo '</span>';
@@ -635,7 +635,7 @@ 
 		echo '</td><td>';
 		if( isset($args['new_win']) ){
 			echo '<input type="checkbox" name="new_win" value="new_win" checked="checked" />';
-		}else{
+		} else{
 			echo '<input type="checkbox" name="new_win" value="new_win" />';
 		}
 		echo '</td></tr>';
@@ -1017,7 +1017,7 @@ 
 		$homepage_key = false;
 		if( isset($gp_index[$homepage]) ){
 			$homepage_key = $gp_index[$homepage];
-		}else{
+		} else{
 
 			foreach($gp_titles as $index => $title){
 				if( $title['label'] === $homepage ){

Spacing +75 added lines, -75 removed lines

@@ -12,7 +12,7 @@ 
 			return;
 		}
 
-		switch($this->cmd){
+		switch( $this->cmd ){
 
 			//adding new files
 			case 'AddHidden':
@@ -121,8 +121,8 @@ 
 		echo '<div class="inline_box">';
 
 		echo '<div class="layout_links" style="float:right">';
-		echo '<a href="#gp_new_copy" data-cmd="tabs" class="selected">'. $langmessage['Copy'] .'</a>';
-		echo '<a href="#gp_new_type" data-cmd="tabs">'. $langmessage['Content Type'] .'</a>';
+		echo '<a href="#gp_new_copy" data-cmd="tabs" class="selected">'.$langmessage['Copy'].'</a>';
+		echo '<a href="#gp_new_type" data-cmd="tabs">'.$langmessage['Content Type'].'</a>';
 		echo '</div>';
 
 
@@ -151,18 +151,18 @@ 
 		echo $langmessage['Copy'];
 		echo '</td><td>';
 		\gp\admin\Menu\Tools::ScrollList($gp_index);
-		echo sprintf($format_bottom,'CopyPage',$langmessage['create_new_file']);
+		echo sprintf($format_bottom, 'CopyPage', $langmessage['create_new_file']);
 
 
 		//content type
 		echo '<tr id="gp_new_type" style="display:none"><td>';
-		echo str_replace(' ','&nbsp;',$langmessage['Content Type']);
+		echo str_replace(' ', '&nbsp;', $langmessage['Content Type']);
 		echo '</td><td>';
 		echo '<div id="new_section_links">';
 		\gp\Page\Edit::NewSections(true);
 		echo '</div>';
 
-		echo sprintf($format_bottom,'NewFile',$langmessage['create_new_file']);
+		echo sprintf($format_bottom, 'NewFile', $langmessage['create_new_file']);
 		echo '</form>';
 		echo '</div>';
 	}
@@ -178,10 +178,10 @@ 
 		$this->search_page = 0; //take user back to first page where the new page will be displayed
 
 		if( isset($_REQUEST['redir']) ){
-			$title	= \gp\tool::IndexToTitle($new_index);
-			$url	= \gp\tool::AbsoluteUrl($title,'',true,false);
-			msg(sprintf($langmessage['will_redirect'],\gp\tool::Link_Page($title)));
-			$this->page->ajaxReplace[] = array('location',$url,15000);
+			$title = \gp\tool::IndexToTitle($new_index);
+			$url = \gp\tool::AbsoluteUrl($title, '', true, false);
+			msg(sprintf($langmessage['will_redirect'], \gp\tool::Link_Page($title)));
+			$this->page->ajaxReplace[] = array('location', $url, 15000);
 		}else{
 			msg($langmessage['SAVED']);
 		}
@@ -272,29 +272,29 @@ 
 			msg($langmessage['OOPS_TITLE']);
 			return false;
 		}
-		$from_index		= $gp_index[$from_title];
-		$info			= $gp_titles[$from_index];
+		$from_index = $gp_index[$from_title];
+		$info = $gp_titles[$from_index];
 
 
 		//check the new title
 		$title			= $_POST['title'];
-		$title			= \gp\admin\Tools::CheckPostedNewPage($title,$message);
+		$title			= \gp\admin\Tools::CheckPostedNewPage($title, $message);
 		if( $title === false ){
 			msg($message);
 			return false;
 		}
 
 		//get the existing content
-		$from_file		= \gp\tool\Files::PageFile($from_title);
-		$contents		= file_get_contents($from_file);
+		$from_file = \gp\tool\Files::PageFile($from_title);
+		$contents = file_get_contents($from_file);
 
 
 		//add to $gp_index first!
-		$index				= \gp\tool::NewFileIndex();
-		$gp_index[$title]	= $index;
-		$file				= \gp\tool\Files::PageFile($title);
+		$index = \gp\tool::NewFileIndex();
+		$gp_index[$title] = $index;
+		$file = \gp\tool\Files::PageFile($title);
 
-		if( !\gp\tool\Files::Save($file,$contents) ){
+		if( !\gp\tool\Files::Save($file, $contents) ){
 			msg($langmessage['OOPS'].' (File not saved)');
 			return false;
 		}
@@ -363,16 +363,16 @@ 
 
 			//tabs
 			echo '<div class="layout_links">';
-			echo ' <a href="#gp_Insert_Copy" data-cmd="tabs" class="selected">'. $langmessage['Copy'] .'</a>';
-			echo ' <a href="#gp_Insert_New" data-cmd="tabs">'. $langmessage['new_file'] .'</a>';
-			echo ' <a href="#gp_Insert_Hidden" data-cmd="tabs">'. $langmessage['Available'] .'</a>';
-			echo ' <a href="#gp_Insert_External" data-cmd="tabs">'. $langmessage['External Link'] .'</a>';
-			echo ' <a href="#gp_Insert_Deleted" data-cmd="tabs">'. $langmessage['trash'] .'</a>';
+			echo ' <a href="#gp_Insert_Copy" data-cmd="tabs" class="selected">'.$langmessage['Copy'].'</a>';
+			echo ' <a href="#gp_Insert_New" data-cmd="tabs">'.$langmessage['new_file'].'</a>';
+			echo ' <a href="#gp_Insert_Hidden" data-cmd="tabs">'.$langmessage['Available'].'</a>';
+			echo ' <a href="#gp_Insert_External" data-cmd="tabs">'.$langmessage['External Link'].'</a>';
+			echo ' <a href="#gp_Insert_Deleted" data-cmd="tabs">'.$langmessage['trash'].'</a>';
 			echo '</div>';
 
 
 			// Copy
-			echo sprintf($format_top,'gp_Insert_Copy','');
+			echo sprintf($format_top, 'gp_Insert_Copy', '');
 			echo '<table class="bordered full_width">';
 			echo '<tr><td>';
 			echo $langmessage['label'];
@@ -383,8 +383,8 @@ 
 			echo $langmessage['Copy'];
 			echo '</td><td>';
 			$copy_list = array();
-			foreach($gp_index as $k => $v){
-				if( strpos($v,'special_') === 0 ){
+			foreach( $gp_index as $k => $v ){
+				if( strpos($v, 'special_') === 0 ){
 					continue;
 				}
 				$copy_list[$k] = $v;
@@ -392,11 +392,11 @@ 
 			\gp\admin\Menu\Tools::ScrollList($copy_list);
 			echo '</td></tr>';
 			echo '</table>';
-			echo sprintf($format_bottom,'CopyPage',$langmessage['Copy']);
+			echo sprintf($format_bottom, 'CopyPage', $langmessage['Copy']);
 
 
 			// Insert New
-			echo sprintf($format_top,'gp_Insert_New','nodisplay');
+			echo sprintf($format_top, 'gp_Insert_New', 'nodisplay');
 			echo '<table class="bordered full_width">';
 			echo '<tr><td>';
 			echo $langmessage['label'];
@@ -412,17 +412,17 @@ 
 			echo '</div>';
 			echo '</td></tr>';
 			echo '</table>';
-			echo sprintf($format_bottom,'NewFile',$langmessage['create_new_file']);
+			echo sprintf($format_bottom, 'NewFile', $langmessage['create_new_file']);
 
 
 			// Insert Hidden
 			$avail = $this->GetAvail_Current();
 
 			if( !empty($avail) ){
-				echo sprintf($format_top,'gp_Insert_Hidden','nodisplay');
+				echo sprintf($format_top, 'gp_Insert_Hidden', 'nodisplay');
 				$avail = array_flip($avail);
-				\gp\admin\Menu\Tools::ScrollList($avail,'keys[]','checkbox',true);
-				echo sprintf($format_bottom,'InsertFromHidden',$langmessage['insert_into_menu']);
+				\gp\admin\Menu\Tools::ScrollList($avail, 'keys[]', 'checkbox', true);
+				echo sprintf($format_bottom, 'InsertFromHidden', $langmessage['insert_into_menu']);
 			}
 
 
@@ -430,18 +430,18 @@ 
 			// Insert Deleted / Restore from trash
 			$scroll_list = $this->TrashScrolllist();
 			if( !empty($scroll_list) ){
-				echo sprintf($format_top,'gp_Insert_Deleted','nodisplay');
+				echo sprintf($format_top, 'gp_Insert_Deleted', 'nodisplay');
 				echo $scroll_list;
-				echo sprintf($format_bottom,'RestoreFromTrash',$langmessage['restore_from_trash']);
+				echo sprintf($format_bottom, 'RestoreFromTrash', $langmessage['restore_from_trash']);
 			}
 
 
 			//Insert External
 			echo '<div id="gp_Insert_External" class="nodisplay">';
-			$args					= array();
-			$args['insert_how']		= $cmd;
-			$args['insert_where']	= $_REQUEST['insert_where'];
-			$this->ExternalForm('NewExternal',$langmessage['insert_into_menu'],$args);
+			$args = array();
+			$args['insert_how'] = $cmd;
+			$args['insert_where'] = $_REQUEST['insert_where'];
+			$this->ExternalForm('NewExternal', $langmessage['insert_into_menu'], $args);
 			echo '</div>';
 
 
@@ -464,7 +464,7 @@ 
 		ob_start();
 		echo '<div class="gp_scrolllist"><div>';
 		echo '<input type="text" name="search" value="" class="gpsearch" placeholder="'.$langmessage['Search'].'" autocomplete="off" />';
-		foreach($trashtitles as $title => $info){
+		foreach( $trashtitles as $title => $info ){
 			if( empty($info['label']) ){
 				continue;
 			}
@@ -530,7 +530,7 @@ 
 		//get list of titles from submitted indexes
 		$titles = array();
 		if( isset($_POST['keys']) ){
-			foreach($_POST['keys'] as $index){
+			foreach( $_POST['keys'] as $index ){
 				if( \gp\tool::IndexToTitle($index) !== false ){
 					$titles[$index]['level'] = 0;
 				}
@@ -571,8 +571,8 @@ 
 
 		$this->CacheSettings();
 
-		$titles			= array();
-		$menu			= \gp\admin\Content\Trash::RestoreTitles($_POST['titles']);
+		$titles = array();
+		$menu = \gp\admin\Content\Trash::RestoreTitles($_POST['titles']);
 
 
 		if( empty($menu) ){
@@ -587,7 +587,7 @@ 
 			return false;
 		}
 
-		\gp\admin\Content\Trash::ModTrashData(null,$titles);
+		\gp\admin\Content\Trash::ModTrashData(null, $titles);
 	}
 
 
@@ -595,7 +595,7 @@ 
 	 * Form for adding external link
 	 *
 	 */
-	public function ExternalForm($cmd,$submit,$args){
+	public function ExternalForm($cmd, $submit, $args){
 		global $langmessage;
 
 		//these aren't all required for each usage of ExternalForm()
@@ -675,9 +675,9 @@ 
 			return;
 		}
 
-		$key			= $this->NewExternalKey();
-		$insert			= array();
-		$insert[$key]	= $array;
+		$key = $this->NewExternalKey();
+		$insert = array();
+		$insert[$key] = $array;
 
 		if( !$this->SaveNew($insert) ){
 			$this->RestoreSettings();
@@ -693,7 +693,7 @@ 
 	public function EditExternal(){
 		global $langmessage;
 
-		$key =& $_REQUEST['key'];
+		$key = & $_REQUEST['key'];
 		if( !isset($this->curr_menu_array[$key]) ){
 			msg($langmessage['OOPS'].' (Current menu not set)');
 			return false;
@@ -706,7 +706,7 @@ 
 
 		echo '<h3>'.$langmessage['External Link'].'</h3>';
 
-		$this->ExternalForm('SaveExternal',$langmessage['save'],$info);
+		$this->ExternalForm('SaveExternal', $langmessage['save'], $info);
 
 		echo '</div>';
 	}
@@ -719,7 +719,7 @@ 
 	public function SaveExternal(){
 		global $langmessage;
 
-		$key =& $_POST['key'];
+		$key = & $_POST['key'];
 		if( !isset($this->curr_menu_array[$key]) ){
 			msg($langmessage['OOPS'].' (Current menu not set)');
 			return false;
@@ -756,7 +756,7 @@ 
 		if( empty($_POST['url']) || $_POST['url'] == 'http://' ){
 			return false;
 		}
-		$array['url']	= htmlspecialchars($_POST['url']);
+		$array['url'] = htmlspecialchars($_POST['url']);
 		$array['label'] = \gp\admin\Tools::PostedLabel($_POST['label']);
 
 		if( empty($array['label']) ){
@@ -776,7 +776,7 @@ 
 
 		$num_index = 0;
 		do{
-			$new_key = '_'.base_convert($num_index,10,36);
+			$new_key = '_'.base_convert($num_index, 10, 36);
 			$num_index++;
 		}while( isset($this->curr_menu_array[$new_key]) );
 
@@ -796,7 +796,7 @@ 
 		//menu modification
 		if( isset($_POST['insert_where']) && isset($_POST['insert_how']) ){
 
-			if( !$this->MenuInsert($titles,$_POST['insert_where'],$_POST['insert_how']) ){
+			if( !$this->MenuInsert($titles, $_POST['insert_where'], $_POST['insert_how']) ){
 				msg($langmessage['OOPS'].' (Insert Failed)');
 				return false;
 			}
@@ -822,16 +822,16 @@ 
 	 * Insert titles into the current menu if needed
 	 *
 	 */
-	public function MenuInsert($titles,$neighbor,$insert_how){
-		switch($insert_how){
+	public function MenuInsert($titles, $neighbor, $insert_how){
+		switch( $insert_how ){
 			case 'insert_before':
-			return $this->MenuInsert_Before($titles,$neighbor);
+			return $this->MenuInsert_Before($titles, $neighbor);
 
 			case 'insert_after':
-			return $this->MenuInsert_After($titles,$neighbor);
+			return $this->MenuInsert_After($titles, $neighbor);
 
 			case 'insert_child':
-			return $this->MenuInsert_After($titles,$neighbor,1);
+			return $this->MenuInsert_After($titles, $neighbor, 1);
 		}
 
 		return false;
@@ -852,10 +852,10 @@ 
 
 		$this->CacheSettings();
 
-		$_POST		+= array('index'=>'');
-		$indexes 	= explode(',',$_POST['index']);
+		$_POST += array('index'=>'');
+		$indexes = explode(',', $_POST['index']);
 
-		foreach($indexes as $index ){
+		foreach( $indexes as $index ){
 
 			if( count($this->curr_menu_array) == 1 ){
 				break;
@@ -894,17 +894,17 @@ 
 		$this->CacheSettings();
 
 		$_POST			+= array('index'=>'');
-		$indexes		= explode(',',$_POST['index']);
-		$trash_data		= array();
+		$indexes		= explode(',', $_POST['index']);
+		$trash_data = array();
 
 
-		foreach($indexes as $index){
+		foreach( $indexes as $index ){
 
-			$title	= \gp\tool::IndexToTitle($index);
+			$title = \gp\tool::IndexToTitle($index);
 
 			// Create file in trash
 			if( $title ){
-				if( !\gp\admin\Content\Trash::MoveToTrash_File($title,$index,$trash_data) ){
+				if( !\gp\admin\Content\Trash::MoveToTrash_File($title, $index, $trash_data) ){
 					msg($langmessage['OOPS'].' (Not Moved)');
 					$this->RestoreSettings();
 					return false;
@@ -919,7 +919,7 @@ 
 					continue;
 				}
 
-				if( !$this->RmFromMenu($index,false) ){
+				if( !$this->RmFromMenu($index, false) ){
 					msg($langmessage['OOPS']);
 					$this->RestoreSettings();
 					return false;
@@ -940,10 +940,10 @@ 
 		}
 
 		$link = \gp\tool::GetUrl('Admin/Trash');
-		msg(sprintf($langmessage['MOVED_TO_TRASH'],$link));
+		msg(sprintf($langmessage['MOVED_TO_TRASH'], $link));
 
 
-		\gp\tool\Plugins::Action('MenuPageTrashed',array($indexes));
+		\gp\tool\Plugins::Action('MenuPageTrashed', array($indexes));
 
 		return true;
 	}
@@ -961,7 +961,7 @@ 
 		global $langmessage, $gp_index;
 
 		//prepare variables
-		$title =& $_REQUEST['title'];
+		$title = & $_REQUEST['title'];
 		if( !isset($gp_index[$title]) ){
 			msg($langmessage['OOPS'].' (R0)');
 			return false;
@@ -976,7 +976,7 @@ 
 	 *
 	 */
 	public function ToggleVisibility(){
-		$_REQUEST += array('index'=>'','visibility'=>'');
+		$_REQUEST += array('index'=>'', 'visibility'=>'');
 		\gp\Page\Visibility::Toggle($_REQUEST['index'], $_REQUEST['visibility']);
 	}
 
@@ -1024,7 +1024,7 @@ 
 			$homepage_key = $gp_index[$homepage];
 		}else{
 
-			foreach($gp_titles as $index => $title){
+			foreach( $gp_titles as $index => $title ){
 				if( $title['label'] === $homepage ){
 					$homepage_key = $index;
 					break;
@@ -1038,7 +1038,7 @@ 
 		}
 
 		$config['homepath_key'] = $homepage_key;
-		$config['homepath']		= \gp\tool::IndexToTitle($config['homepath_key']);
+		$config['homepath'] = \gp\tool::IndexToTitle($config['homepath_key']);
 		if( !\gp\admin\Tools::SaveConfig(true) ){
 			return;
 		}
@@ -1048,7 +1048,7 @@ 
 		$this->HomepageDisplay();
 		$content = ob_get_clean();
 
-		$this->page->ajaxReplace[] = array('inner','.homepage_setting',$content);
+		$this->page->ajaxReplace[] = array('inner', '.homepage_setting', $content);
 	}
 
 

include/admin/Menu/Tools.php

Doc Comments +1 added lines

@@ -114,6 +114,7 @@
 	/**
 	 * Get the css class representing the current page's visibility
 	 *
+	 * @param string $class
 	 */
 	public static function VisibilityClass($class, $index){
 		global $gp_menu, $gp_titles;

Spacing +38 added lines, -38 removed lines

@@ -35,7 +35,7 @@ 
 		$inherit_info = array();
 
 
-		foreach($gp_menu as $id => $titleInfo){
+		foreach( $gp_menu as $id => $titleInfo ){
 
 			$level = $titleInfo['level'];
 			$inherit_info[$id] = array();
@@ -50,7 +50,7 @@ 
 				}
 			}
 
-			foreach($current_par_info as $parent_level => $parent_info){
+			foreach( $current_par_info as $parent_level => $parent_info ){
 				$parent_id = $parent_info['id'];
 
 				if( $parent_level < $level ){
@@ -86,7 +86,7 @@ 
 	 *
 	 */
 	public static function CurrentLayout($index){
-		global $config, $gp_titles,$gpLayouts;
+		global $config, $gp_titles, $gpLayouts;
 		static $Inherit_Info;
 
 		if( is_null($Inherit_Info) ){
@@ -123,8 +123,8 @@ 
 			return $class;
 		}
 
-		$parents = \gp\tool::Parents($index,$gp_menu);
-		foreach($parents as $parent_index){
+		$parents = \gp\tool::Parents($index, $gp_menu);
+		foreach( $parents as $parent_index ){
 			if( isset($gp_titles[$parent_index]['vis']) ){
 				$class .= ' private-inherited';
 				break;
@@ -141,10 +141,10 @@ 
 	 */
 	public static function MenuLink($data, $class = ''){
 
-		$class	= 'gp_label sort '.$class;
-		$json	= \gp\tool::JsonEncode($data);
+		$class = 'gp_label sort '.$class;
+		$json = \gp\tool::JsonEncode($data);
 
-		echo '<a class="'.$class.'" data-cmd="menu_info" data-arg="'.str_replace('&','&amp;',$data['key']).'" data-json=\''.htmlspecialchars($json,ENT_QUOTES & ~ENT_COMPAT).'\'>';
+		echo '<a class="'.$class.'" data-cmd="menu_info" data-arg="'.str_replace('&', '&amp;', $data['key']).'" data-json=\''.htmlspecialchars($json, ENT_QUOTES & ~ENT_COMPAT).'\'>';
 	}
 
 
@@ -157,7 +157,7 @@ 
 
 		if( !isset($gp_titles[$config['homepath_key']]) ){
 			$config['homepath_key'] = key($gp_menu);
-			$config['homepath']		= \gp\tool::IndexToTitle($config['homepath_key']);
+			$config['homepath'] = \gp\tool::IndexToTitle($config['homepath_key']);
 		}
 	}
 
@@ -170,11 +170,11 @@ 
 	 * @pearm string $type
 	 * @param bool $index_as_value
 	 */
-	public static function ScrollList($list, $name = 'from_title', $type = 'radio', $index_as_value = false ){
+	public static function ScrollList($list, $name = 'from_title', $type = 'radio', $index_as_value = false){
 		global $langmessage;
 
 		$list_out = array();
-		foreach($list as $title => $index){
+		foreach( $list as $title => $index ){
 			ob_start();
 			echo '<label>';
 			if( $index_as_value ){
@@ -194,10 +194,10 @@ 
 			$list_out[$title] = ob_get_clean();
 		}
 
-		uksort($list_out,'strnatcasecmp');
+		uksort($list_out, 'strnatcasecmp');
 		echo '<div class="gp_scrolllist"><div>';
 		echo '<input type="text" name="search" value="" class="gpsearch" placeholder="'.$langmessage['Search'].'" autocomplete="off" />';
-		echo implode('',$list_out);
+		echo implode('', $list_out);
 		echo '</div></div>';
 	}
 
@@ -212,7 +212,7 @@ 
 
 		//check title
 		$title		= $_POST['title'];
-		$title		= \gp\admin\Tools::CheckPostedNewPage($title,$message);
+		$title		= \gp\admin\Tools::CheckPostedNewPage($title, $message);
 		if( $title === false ){
 			msg($message);
 			return false;
@@ -220,31 +220,31 @@ 
 
 
 		//multiple section types
-		$type		= $_POST['content_type'];
+		$type = $_POST['content_type'];
 
 
 		// multiple wrapped sections
-		if( strpos($type,'{') === 0 ){
-			$combo = json_decode($type,true);
+		if( strpos($type, '{') === 0 ){
+			$combo = json_decode($type, true);
 			if( $combo ){
 
 				$combo		+= array('wrapper_class'=>'gpRow');
-				$content	= self::GetComboContent($combo['types'],$combo['wrapper_class']);
+				$content	= self::GetComboContent($combo['types'], $combo['wrapper_class']);
 
 
 				$type = '';
 				// borrowed from \gp\Page\Edit::ResetFileTypes()
-				foreach($content as $section){
+				foreach( $content as $section ){
 					$type[] = $section['type'];
 				}
 				$type = array_unique($type);
-				$type = array_diff($type,array(''));
+				$type = array_diff($type, array(''));
 				sort($type);
-				$type = implode(',',$type);
+				$type = implode(',', $type);
 			}
 		//single section type
 		}else{
-			$content	= \gp\tool\Editing::DefaultContent($type, $_POST['title']);
+			$content = \gp\tool\Editing::DefaultContent($type, $_POST['title']);
 			if( $content['content'] === false ){
 				return false;
 			}
@@ -252,10 +252,10 @@ 
 
 
 		//add to $gp_index first!
-		$index							= \gp\tool::NewFileIndex();
-		$gp_index[$title]				= $index;
+		$index = \gp\tool::NewFileIndex();
+		$gp_index[$title] = $index;
 
-		if( !\gp\tool\Files::NewTitle($title,$content,$type) ){
+		if( !\gp\tool\Files::NewTitle($title, $content, $type) ){
 			msg($langmessage['OOPS'].' (cn1)');
 			unset($gp_index[$title]);
 			return false;
@@ -270,12 +270,12 @@ 
 
 		//add to users editing
 		if( $gpAdmin['editing'] != 'all' ){
-			$gpAdmin['editing'] = rtrim($gpAdmin['editing'],',').','.$index.',';
+			$gpAdmin['editing'] = rtrim($gpAdmin['editing'], ',').','.$index.',';
 
 
-			$users		= \gp\tool\Files::Get('_site/users');
+			$users = \gp\tool\Files::Get('_site/users');
 			$users[$gpAdmin['username']]['editing'] = $gpAdmin['editing'];
-			\gp\tool\Files::SaveData('_site/users','users',$users);
+			\gp\tool\Files::SaveData('_site/users', 'users', $users);
 
 		}
 
@@ -288,27 +288,27 @@ 
 	 * Get nested Section Combo content
 	 *
 	 */
-	public static function GetComboContent($types, $wrapper_class, $content=array()){
+	public static function GetComboContent($types, $wrapper_class, $content = array()){
 
 		//$combo								+= array('label'=>$combo_label);		// push the combo label through to all subsections if none (no sub-label) given
 
 		// create wrapper section
-		$section							= \gp\tool\Editing::DefaultContent('wrapper_section');
-		$section['contains_sections']		= count($types);
-		$section['attributes']['class']		= $wrapper_class;
-		$content[]							= $section;
+		$section = \gp\tool\Editing::DefaultContent('wrapper_section');
+		$section['contains_sections'] = count($types);
+		$section['attributes']['class'] = $wrapper_class;
+		$content[] = $section;
 
 
-		foreach($types as $type){
+		foreach( $types as $type ){
 			if( is_array($type) ){
 				$_wrapper_class = isset($type[1]) ? $type[1] : '';
 				$content = self::GetComboContent($type[0], $_wrapper_class, $content);
 			}else{
 
-				$class							= \gp\Page\Edit::TypeClass($type);
-				$section						= \gp\tool\Editing::DefaultContent($type);
-				$section['attributes']['class']	.= ' '.$class;
-				$content[]						= $section;
+				$class = \gp\Page\Edit::TypeClass($type);
+				$section = \gp\tool\Editing::DefaultContent($type);
+				$section['attributes']['class'] .= ' '.$class;
+				$content[] = $section;
 			}
 
 		}

Braces +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
 				if( $parent_level < $level ){
 					if( isset($inherit_info[$parent_id]['children']) ){
 						$inherit_info[$parent_id]['children']++;
-					}else{
+					} else{
 						$inherit_info[$parent_id]['children'] = 1;
 					}
 				}
@@ -179,7 +179,7 @@ 
 			echo '<label>';
 			if( $index_as_value ){
 				echo '<input type="'.$type.'" name="'.$name.'" value="'.htmlspecialchars($index).'" />';
-			}else{
+			} else{
 				echo '<input type="'.$type.'" name="'.$name.'" value="'.htmlspecialchars($title).'" />';
 			}
 			echo '<span>';
@@ -243,7 +243,7 @@ 
 				$type = implode(',',$type);
 			}
 		//single section type
-		}else{
+		} else{
 			$content	= \gp\tool\Editing::DefaultContent($type, $_POST['title']);
 			if( $content['content'] === false ){
 				return false;
@@ -303,7 +303,7 @@ 
 			if( is_array($type) ){
 				$_wrapper_class = isset($type[1]) ? $type[1] : '';
 				$content = self::GetComboContent($type[0], $_wrapper_class, $content);
-			}else{
+			} else{
 
 				$class							= \gp\Page\Edit::TypeClass($type);
 				$section						= \gp\tool\Editing::DefaultContent($type);
@@ -351,7 +351,7 @@ 
 		if( count($gp_menu) ){
 			reset($gp_menu);
 			$first_index = key($gp_menu);
-		}else{
+		} else{
 			reset($gp_titles);
 			$first_index = key($gp_titles);
 		}

include/admin/Page.php

Doc Comments +1 added lines

@@ -230,6 +230,7 @@
 	/**
 	 * Get admin script info if the request slug uses underscores or slashes
 	 *
+	 * @param string $request_string
 	 */
 	private function GetScriptInfo(&$request_string){
 

Braces +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 		$this->config['content'] = $content;
 		if( $this->SaveConfig() ){
 			message($langmessage['SAVED']);
-		}else{
+		} else{
 			message($langmessage['OOPS']);
 		}
 	}

Spacing +40 added lines, -40 removed lines

@@ -6,29 +6,29 @@ 
 
 class Page extends \gp\Page{
 
-	public $pagetype				= 'admin_display';
+	public $pagetype = 'admin_display';
 
-	public $show_admin_content		= true;
-	public $non_admin_content		= '';
-	public $admin_html				= '';
+	public $show_admin_content = true;
+	public $non_admin_content = '';
+	public $admin_html = '';
 
-	private	$scripts				= array();
-	private $script_keys			= array();
+	private	$scripts = array();
+	private $script_keys = array();
 
 
 	public function __construct($title){
 		global $langmessage;
 
 
-		$this->requested	= str_replace(' ','_',$title);
-		$this->label		= $langmessage['administration'];
-		$this->scripts		= \gp\admin\Tools::AdminScripts();
+		$this->requested = str_replace(' ', '_', $title);
+		$this->label = $langmessage['administration'];
+		$this->scripts = \gp\admin\Tools::AdminScripts();
 		$this->script_keys	= array_keys($this->scripts);
-		$this->script_keys	= array_combine( str_replace('_','/',$this->script_keys), $this->script_keys);
+		$this->script_keys	= array_combine(str_replace('_', '/', $this->script_keys), $this->script_keys);
 
 
 		$this->head .= "\n".'<meta name="robots" content="noindex,nofollow" />';
-		@header( 'X-Frame-Options: SAMEORIGIN' );
+		@header('X-Frame-Options: SAMEORIGIN');
 	}
 
 
@@ -114,24 +114,24 @@ 
 
 		echo '<div id="admin_breadcrumbs" class="cf">';
 
-		echo \gp\tool::Link('',$langmessage['Homepage']);
+		echo \gp\tool::Link('', $langmessage['Homepage']);
 		echo ' &#187; ';
-		echo \gp\tool::Link('Admin',$langmessage['administration']);
+		echo \gp\tool::Link('Admin', $langmessage['administration']);
 
 
-		$crumbs				= array();
-		$request_string		= str_replace('_','/',$this->requested);
-		$parts				= explode('/',$request_string);
+		$crumbs = array();
+		$request_string = str_replace('_', '/', $this->requested);
+		$parts = explode('/', $request_string);
 
 		do{
 
-			$request_string		= implode('/',$parts);
-			$scriptinfo			= $this->GetScriptInfo($request_string);
+			$request_string = implode('/', $parts);
+			$scriptinfo = $this->GetScriptInfo($request_string);
 
 			if( is_array($scriptinfo) && isset($scriptinfo['label']) ){
 				$crumbs[$request_string] = $scriptinfo['label'];
 			}
-		}while(array_pop($parts));
+		}while( array_pop($parts) );
 
 
 		//page label
@@ -140,9 +140,9 @@ 
 
 		//add to breadcrumbs
 		$crumbs = array_reverse($crumbs);
-		foreach($crumbs as $slug => $label){
+		foreach( $crumbs as $slug => $label ){
 			echo ' &#187; ';
-			echo \gp\tool::Link($slug,$label);
+			echo \gp\tool::Link($slug, $label);
 		}
 
 
@@ -187,7 +187,7 @@ 
 	 *
 	 */
 	private function RunAdminScript(){
-		global $dataDir,$langmessage;
+		global $dataDir, $langmessage;
 
 
 		if( strtolower($this->requested) == 'admin' ){
@@ -197,19 +197,19 @@ 
 
 
 		//resolve request for /Admin_Theme_Content if the request is for /Admin_Theme_Conent/1234
-		$request_string		= str_replace('_','/',$this->requested);
-		$parts				= explode('/',$request_string);
+		$request_string = str_replace('_', '/', $this->requested);
+		$parts = explode('/', $request_string);
 
 		do{
 
-			$request_string		= implode('/',$parts);
-			$scriptinfo			= $this->GetScriptInfo($request_string);
+			$request_string = implode('/', $parts);
+			$scriptinfo = $this->GetScriptInfo($request_string);
 			if( is_array($scriptinfo) ){
 
 				if( \gp\admin\Tools::HasPermission($request_string) ){
 
 					$this->OrganizeFrequentScripts($request_string);
-					\gp\tool\Output::ExecInfo($scriptinfo, array('page'=>$this) );
+					\gp\tool\Output::ExecInfo($scriptinfo, array('page'=>$this));
 
 					return;
 				}
@@ -221,7 +221,7 @@ 
 
 
 			//these are here because they should be available to everyone
-			switch($request_string){
+			switch( $request_string ){
 				case 'Admin/Finder':
 					if( \gp\admin\Tools::HasPermission('Admin_Uploaded') ){
 						includeFile('thirdparty/finder/connector.php');
@@ -262,21 +262,21 @@ 
 
 		//find similar
 		$scripts			= $this->scripts;
-		$scripts['Admin']	= array();
+		$scripts['Admin'] = array();
 		$similar			= array();
-		$lower_req			= strtolower($this->requested);
+		$lower_req = strtolower($this->requested);
 
-		foreach($scripts as $key => $script_info){
-			$lower_key	= strtolower($key);
+		foreach( $scripts as $key => $script_info ){
+			$lower_key = strtolower($key);
 
-			similar_text($lower_req,$lower_key,$percent);
+			similar_text($lower_req, $lower_key, $percent);
 			$similar[$key] = $percent;
 		}
 
 		arsort($similar);
 
-		$redir_key		= key($similar);
-		$location		= \gp\tool::GetUrl($redir_key,'',false);
+		$redir_key = key($similar);
+		$location = \gp\tool::GetUrl($redir_key, '', false);
 		\gp\tool::Redirect($location);
 	}
 
@@ -289,14 +289,14 @@ 
 		global $langmessage;
 
 		$cmd = \gp\tool::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 			case 'embededcheck':
 				new \gp\admin\Update('embededcheck');
 			return;
 
 			case 'autocomplete-titles':
 			$opts = array('var_name'=>false);
-			echo \gp\tool\Editing::AutoCompleteValues(false,$opts);
+			echo \gp\tool\Editing::AutoCompleteValues(false, $opts);
 			die();
 		}
 
@@ -343,15 +343,15 @@ 
 		//reduce to length of 5;
 		$count = count($gpAdmin['freq_scripts']);
 		if( $count > 3 ){
-			for($i=0;$i < ($count - 5);$i++){
+			for( $i = 0; $i < ($count-5); $i++ ){
 				array_pop($gpAdmin['freq_scripts']);
 			}
 		}
 
 		//reduce the hit count on each of the top five
 		$min_value = end($gpAdmin['freq_scripts']);
-		foreach($gpAdmin['freq_scripts'] as $page => $hits){
-			$gpAdmin['freq_scripts'][$page] = $hits - $min_value;
+		foreach( $gpAdmin['freq_scripts'] as $page => $hits ){
+			$gpAdmin['freq_scripts'][$page] = $hits-$min_value;
 		}
 	}
 

include/admin/Settings/CKEditor.php

Doc Comments +1 added lines

@@ -314,6 +314,7 @@
 	/**
 	 * Get the plugin name from the plugin.js file
 	 * use regular expression to look for "CKEDITOR.plugins.add('plugin-name'"
+	 * @param \gp\tool\Archive $archive
 	 */
 	function FindPluginName($archive, $name){
 

Braces +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
 			echo $separator;
 			if( $slug == $this->current_subpage ){
 				echo $label;
-			}else{
+			} else{
 				echo \gp\tool::Link( rtrim('Admin/CKEditor/'.$slug,'/'), $label );
 			}
 			$separator = ' <span>|</span> ';
@@ -350,7 +350,7 @@ 
 		unset( $this->cke_config['plugins'][$plugin] );
 		if( !$this->SaveConfig() ){
 			msg($langmessage['OOPS'].' (Not Saved)');
-		}else{
+		} else{
 			msg($langmessage['SAVED']);
 		}
 
@@ -373,7 +373,7 @@ 
 		echo '<textarea name="custom_config" class="custom_config full_width" placeholder="'.htmlspecialchars($placeholder).'">';
 		if( isset($_POST['custom_config']) ){
 			echo htmlspecialchars($_POST['custom_config']);
-		}elseif( !empty($this->cke_config['custom_config']) ){
+		} elseif( !empty($this->cke_config['custom_config']) ){
 			echo htmlspecialchars(self::ReadableJson($this->cke_config['custom_config']));
 		}
 		echo '</textarea>';
@@ -409,7 +409,7 @@ 
 
 		if( !$this->SaveConfig() ){
 			msg($langmessage['OOPS'].' (Not Saved)');
-		}else{
+		} else{
 			msg($langmessage['SAVED']);
 		}
 
@@ -529,7 +529,7 @@ 
 		foreach($mixed as $key => $value){
 			if( !is_integer($key) && !ctype_digit($key) ){
 				$indexed = false;
-			}elseif( (int)$key !== $i ){
+			} elseif( (int)$key !== $i ){
 				$indexed = false;
 			}
 			if( !$indexed || is_array($value) ){
@@ -547,7 +547,7 @@ 
 			}
 			$output .= $separator.']';
 
-		}else{
+		} else{
 			$output = '{';
 			foreach($mixed as $key => $value){
 				$output .= $comma.$separator.self::ReadableJson($key).' :'.self::ReadableJson($value);

Spacing +48 added lines, -48 removed lines

@@ -7,7 +7,7 @@ 
 class CKEditor extends \gp\admin\Base{
 
 	var $config_file;
-	var $cke_config			= array();
+	var $cke_config = array();
 	var $build_config;
 
 	var $subpages;
@@ -31,16 +31,16 @@ 
 			);
 
 
-		$parts = explode('/',$this->page->requested);
+		$parts = explode('/', $this->page->requested);
 
-		if( count($parts) > 2 && array_key_exists( $parts[2], $this->subpages ) ){
+		if( count($parts) > 2 && array_key_exists($parts[2], $this->subpages) ){
 			$this->current_subpage = $parts[2];
 		}
 
 
 		// commands
 		$cmd = \gp\tool::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 
 			case 'save_custom_config':
 				$this->SaveCustomConfig();
@@ -63,7 +63,7 @@ 
 		$this->Heading();
 
 
-		switch($this->current_subpage){
+		switch( $this->current_subpage ){
 			case 'Example':
 				$this->Example();
 			break;
@@ -86,12 +86,12 @@ 
 		echo '<h2 class="hmargin">CKEditor &#187; ';
 
 		$separator = '';
-		foreach($this->subpages as $slug => $label){
+		foreach( $this->subpages as $slug => $label ){
 			echo $separator;
 			if( $slug == $this->current_subpage ){
 				echo $label;
 			}else{
-				echo \gp\tool::Link( rtrim('Admin/CKEditor/'.$slug,'/'), $label );
+				echo \gp\tool::Link(rtrim('Admin/CKEditor/'.$slug, '/'), $label);
 			}
 			$separator = ' <span>|</span> ';
 		}
@@ -110,15 +110,15 @@ 
 		echo '<form method="post" action="'.\gp\tool::GetUrl($this->page->requested).'" enctype="multipart/form-data">';
 		echo '<table class="bordered"><tr><th>'.$langmessage['name'].'</th><th>'.$langmessage['Modified'].'</th><th>'.$langmessage['options'].'</th></tr>';
 		if( count($this->cke_config['plugins']) ){
-			foreach($this->cke_config['plugins'] as $plugin_name => $plugin_info){
+			foreach( $this->cke_config['plugins'] as $plugin_name => $plugin_info ){
 				echo '<tr><td>';
 				echo $plugin_name;
 				echo '</td><td>';
-				echo \gp\tool::date($langmessage['strftime_datetime'],$plugin_info['updated']);
+				echo \gp\tool::date($langmessage['strftime_datetime'], $plugin_info['updated']);
 				echo '</td><td>';
 
-				$attr = array('data-cmd'=>'postlink', 'class'=>'gpconfirm','title'=>sprintf($langmessage['generic_delete_confirm'],$plugin_name));
-				echo \gp\tool::Link($this->page->requested,$langmessage['delete'],'cmd=rmplugin&plugin='.rawurlencode($plugin_name), $attr );
+				$attr = array('data-cmd'=>'postlink', 'class'=>'gpconfirm', 'title'=>sprintf($langmessage['generic_delete_confirm'], $plugin_name));
+				echo \gp\tool::Link($this->page->requested, $langmessage['delete'], 'cmd=rmplugin&plugin='.rawurlencode($plugin_name), $attr);
 				echo '</td></tr>';
 
 			}
@@ -141,13 +141,13 @@ 
 
 			$ordered = array();
 			$count = 0;
-			foreach($this->build_config['plugins'] as $plugin => $status){
+			foreach( $this->build_config['plugins'] as $plugin => $status ){
 				if( !$status ){
 					continue;
 				}
 
-				$char				= strtoupper($plugin[0]);
-				$ordered[$char][]	= '<a href="http://ckeditor.com/addon/'.$plugin.'" target="_blank">'.ucfirst($plugin).'</a>';
+				$char = strtoupper($plugin[0]);
+				$ordered[$char][] = '<a href="http://ckeditor.com/addon/'.$plugin.'" target="_blank">'.ucfirst($plugin).'</a>';
 				$count++;
 			}
 
@@ -155,11 +155,11 @@ 
 			echo '<p><br/></p>';
 			echo '<table class="bordered">';
 			echo '<tr><th colspan="2">'.$langmessage['Installed'].' ('.$count.')</th></tr>';
-			foreach($ordered as $char => $plugins){
+			foreach( $ordered as $char => $plugins ){
 				echo '<tr><td>';
 				echo '<b>'.$char.'</b>';
 				echo '</td><td>';
-				echo implode(', ',$plugins);
+				echo implode(', ', $plugins);
 				echo '</td></tr>';
 			}
 			echo '</table>';
@@ -183,11 +183,11 @@ 
 
 
 		// get plugin name and check file types
-		$list			= $archive->ListFiles();
+		$list = $archive->ListFiles();
 		$plugin_name	= '';
 		$remove_path	= '';
 
-		foreach($list as $file){
+		foreach( $list as $file ){
 
 			//don't check extensions on folder
 			if( $file['size'] == 0 ){
@@ -202,7 +202,7 @@ 
 
 
 			//plugin name
-			if( strpos($file['name'],'plugin.js') !== false ){
+			if( strpos($file['name'], 'plugin.js') !== false ){
 
 				$new_plugin_name = $this->FindPluginName($archive, $file['name']);
 				if( !$new_plugin_name ){
@@ -210,7 +210,7 @@ 
 				}
 
 				//use the most relevant plugin name
-				$new_path	= dirname($file['name']);
+				$new_path = dirname($file['name']);
 				if( !$plugin_name || strlen($new_path) < strlen($remove_path) ){
 					$plugin_name	= $new_plugin_name;
 					$remove_path	= $new_path;
@@ -235,7 +235,7 @@ 
 
 		//move to _ckeditor folder
 		$destination = $dataDir.'/data/_ckeditor/'.$plugin_name;
-		$rename_from = $extract_temp.'/'.ltrim($remove_path,'/');
+		$rename_from = $extract_temp.'/'.ltrim($remove_path, '/');
 		if( !\gp\tool\Files::Replace($rename_from, $destination) ){
 			msg($langmessage['OOPS'].' (Not replaced)');
 			return false;
@@ -243,7 +243,7 @@ 
 
 
 		// save configuration
-		if( !array_key_exists( $plugin_name, $this->cke_config['plugins'] ) ){
+		if( !array_key_exists($plugin_name, $this->cke_config['plugins']) ){
 			$this->cke_config['plugins'][$plugin_name] = array('installed'=>time());
 		}
 
@@ -268,7 +268,7 @@ 
 
 		$plugin_file = $_FILES['plugin'];
 
-		if( strpos($plugin_file['name'],'.zip') === false ){
+		if( strpos($plugin_file['name'], '.zip') === false ){
 			msg($langmessage['OOPS'].' (Not a zip file)');
 			return;
 		}
@@ -328,7 +328,7 @@ 
 
 		$pattern = '/CKEDITOR\s*\.\s*plugins\s*\.\s*add\s*\(\s*[\'"]([^\'"]+)[\'"]/';
 
-		if( !preg_match($pattern,$content,$match) ){
+		if( !preg_match($pattern, $content, $match) ){
 			return false;
 		}
 
@@ -343,13 +343,13 @@ 
 	function RemovePlugin(){
 		global $langmessage, $dataDir;
 
-		$plugin =& $_REQUEST['plugin'];
-		if( !is_array($this->cke_config['plugins']) || !array_key_exists( $plugin, $this->cke_config['plugins'] ) ){
+		$plugin = & $_REQUEST['plugin'];
+		if( !is_array($this->cke_config['plugins']) || !array_key_exists($plugin, $this->cke_config['plugins']) ){
 			msg($langmessage['OOPS'].' ( )');
 			return;
 		}
 
-		unset( $this->cke_config['plugins'][$plugin] );
+		unset($this->cke_config['plugins'][$plugin]);
 		if( !$this->SaveConfig() ){
 			msg($langmessage['OOPS'].' (Not Saved)');
 		}else{
@@ -358,7 +358,7 @@ 
 
 
 		$path = $dataDir.'/data/_ckeditor/'.$plugin;
-		\gp\tool\Files::RmAll( $path );
+		\gp\tool\Files::RmAll($path);
 	}
 
 
@@ -396,10 +396,10 @@ 
 	function SaveCustomConfig(){
 		global $langmessage;
 
-		$custom_config =& $_REQUEST['custom_config'];
+		$custom_config = & $_REQUEST['custom_config'];
 		$decoded = array();
 		if( !empty($custom_config) ){
-			$decoded = json_decode($custom_config,true);
+			$decoded = json_decode($custom_config, true);
 			if( !is_array($decoded) ){
 				msg($langmessage['OOPS'].' (Invalid JSON String)');
 				return false;
@@ -437,7 +437,7 @@ 
 
 		echo '<h3>'.$langmessage['Current Configuration'].'</h3>';
 
-		$default_config = \gp\tool\Editing::CKConfig(array(),'array');
+		$default_config = \gp\tool\Editing::CKConfig(array(), 'array');
 		echo '<pre class="json">';
 		echo self::ReadableJson($default_config);
 		echo '</pre>';
@@ -449,7 +449,7 @@ 
 	 *
 	 */
 	function SaveConfig(){
-		return \gp\tool\Files::SaveData($this->config_file,'cke_config',$this->cke_config);
+		return \gp\tool\Files::SaveData($this->config_file, 'cke_config', $this->cke_config);
 	}
 
 
@@ -459,11 +459,11 @@ 
 	 */
 	function Init(){
 
-		$this->config_file		= '_ckeditor/config';
-		$this->cke_config		= \gp\tool\Files::Get($this->config_file,'cke_config');
+		$this->config_file = '_ckeditor/config';
+		$this->cke_config = \gp\tool\Files::Get($this->config_file, 'cke_config');
 
 		//$this->cke_config 	+= array('custom_config'=>array());
-		$this->cke_config		+= array('plugins'=>array());
+		$this->cke_config += array('plugins'=>array());
 
 		$this->BuildConfig();
 	}
@@ -479,30 +479,30 @@ 
 
 
 		//get data from build-config.js to determine which plugins are already included
-		$build_file				= $dataDir.'/include/thirdparty/ckeditor_34/build-config.js';
-		$build_config			= file_get_contents($build_file);
+		$build_file = $dataDir.'/include/thirdparty/ckeditor_34/build-config.js';
+		$build_config = file_get_contents($build_file);
 		if( !$build_config ){
 			return;
 		}
 
 
 		// quotes
-		$build_config			= str_replace('\'','"',$build_config);
+		$build_config			= str_replace('\'', '"', $build_config);
 		$build_config			= str_replace("\r\n", "\n", $build_config);
 
 		// remove comments
-		$build_config			= preg_replace("/\/\*[\d\D]*?\*\//",'',$build_config);
+		$build_config			= preg_replace("/\/\*[\d\D]*?\*\//", '', $build_config);
 
 		// remove "var CKBUILDER_CONFIG = "
-		$pos					= strpos($build_config,'{');
-		$build_config			= substr($build_config,$pos);
+		$pos = strpos($build_config, '{');
+		$build_config			= substr($build_config, $pos);
 		$build_config			= trim($build_config);
-		$build_config			= trim($build_config,';');
+		$build_config			= trim($build_config, ';');
 
 		// fix variable names
-		$build_config			= preg_replace("/([a-zA-Z0-9_]+?)\s*:/" , "\"$1\":", $build_config);
+		$build_config			= preg_replace("/([a-zA-Z0-9_]+?)\s*:/", "\"$1\":", $build_config);
 
-		$this->build_config		= json_decode($build_config,true);
+		$this->build_config = json_decode($build_config, true);
 	}
 
 
@@ -527,14 +527,14 @@ 
 		$i = 0;
 		$indexed = true;
 		$separator = ' ';
-		foreach($mixed as $key => $value){
+		foreach( $mixed as $key => $value ){
 			if( !is_integer($key) && !ctype_digit($key) ){
 				$indexed = false;
 			}elseif( (int)$key !== $i ){
 				$indexed = false;
 			}
 			if( !$indexed || is_array($value) ){
-				$separator = "\n".str_repeat('    ',$level);
+				$separator = "\n".str_repeat('    ', $level);
 			}
 			$i++;
 		}
@@ -542,7 +542,7 @@ 
 		$comma = '';
 		if( $indexed ){
 			$output = '[';
-			foreach($mixed as $key => $value){
+			foreach( $mixed as $key => $value ){
 				$output .= $comma.$separator.self::ReadableJson($value);
 				$comma = ',';
 			}
@@ -550,7 +550,7 @@ 
 
 		}else{
 			$output = '{';
-			foreach($mixed as $key => $value){
+			foreach( $mixed as $key => $value ){
 				$output .= $comma.$separator.self::ReadableJson($key).' :'.self::ReadableJson($value);
 				$comma = ',';
 			}